Update airootfs from releng

Idea:
* Remove unwanted files
* Modify / Replace wanted files
* Add additional files
This commit is contained in:
2Shirt 2017-12-12 12:27:47 -08:00
parent a8033f0a02
commit 708ffe1157

View file

@ -59,6 +59,24 @@ function copy_archiso() {
if ! grep -iq 'customize_iso' "$ARCHLIVE_DIR/build.sh"; then
sed -ir "s!run_once make_iso\$!# customize_iso\ncp -a \"$ROOT_DIR/.linux_items/include/iso\"/* \"\${work_dir}/iso\"/\n\nrun_once make_iso!" "$ARCHLIVE_DIR/build.sh"
fi
# Remove items
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/scripts/choose-mirror"
rmdir "$ARCHLIVE_DIR/airootfs/etc/systemd/scripts" --ignore-fail-on-non-empty
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/system/choose-mirror.service"
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount"
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/system/pacman-init.service"
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/udev/rules.d/81-dhcpcd.rules"
rmdir "$ARCHLIVE_DIR/airootfs/etc/systemd/udev/rules.d" --ignore-fail-on-non-empty
rmdir "$ARCHLIVE_DIR/airootfs/etc/systemd/udev" --ignore-fail-on-non-empty
# Update items
sed -i "s/WK/$KIT_NAME_SHORT/" "$ARCHLIVE_DIR/airootfs/etc/motd"
sed -ir 's/^(b43|clonezilla|gpm|grml|refind|testdisk|vim)/#\1/' "$ARCHLIVE_DIR/packages.both"
cat "$ROOT_DIR/.linux_items/packages/live" >> "$ARCHLIVE_DIR/packages.both"
echo "[CustomRepo]" >> "$ARCHLIVE_DIR/pacman.conf"
echo "SigLevel = Optional TrustAll" >> "$ARCHLIVE_DIR/pacman.conf"
echo "file://$CUSTOM_REPO_DIR" >> "$ARCHLIVE_DIR/pacman.conf"
}
function copy_settings() {