diff --git a/.linux_items/packages/live b/.linux_items/packages/live_add similarity index 98% rename from .linux_items/packages/live rename to .linux_items/packages/live_add index 0bf86276..ae5e433e 100644 --- a/.linux_items/packages/live +++ b/.linux_items/packages/live_add @@ -6,6 +6,7 @@ bash-pipes bc bluez bluez-utils +broadcom-wl-dkms cbatticon chntpw cmatrix diff --git a/.linux_items/packages/live_remove b/.linux_items/packages/live_remove new file mode 100644 index 00000000..5e090d49 --- /dev/null +++ b/.linux_items/packages/live_remove @@ -0,0 +1,21 @@ +arch-install-scripts +b43-fwcutter +broadcom-wl +darkhttpd +gpm +grml-zsh-config +grub +irssi +mc +openvpn +ppp +pptpclient +refind-efi +rp-pppoe +smartmontools +speedtouch +testdisk +vim-minimal +vpnc +wvdial +xl2tpd diff --git a/Build Linux b/Build Linux index 3a50b9af..6ee0f169 100755 --- a/Build Linux +++ b/Build Linux @@ -189,8 +189,10 @@ function update_live_env() { echo "127.0.1.1 $hostname.localdomain $hostname" >> "$LIVE_DIR/airootfs/etc/hosts" # Live packages - sed -i -r 's/^(b43|clonezilla|gpm|grml|refind|testdisk|vim)/#\1/' "$LIVE_DIR/packages.both" - cat "$ROOT_DIR/.linux_items/packages/live" >> "$LIVE_DIR/packages.both" + while read -r p; do + sed -i "/$p/d" "$LIVE_DIR/packages.both" + done < "$ROOT_DIR/.linux_items/packages/live_remove" + cat "$ROOT_DIR/.linux_items/packages/live_add" >> "$LIVE_DIR/packages.both" echo "[custom]" >> "$LIVE_DIR/pacman.conf" echo "SigLevel = Optional TrustAll" >> "$LIVE_DIR/pacman.conf" echo "Server = file://$REPO_DIR" >> "$LIVE_DIR/pacman.conf"