| index : archiso32 | |
| Archlinux32 iso tools | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archiso/hooks/archiso | 2 | ||||
| -rwxr-xr-x | archiso/mkarchiso | 12 |
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 8a6b648..376593b 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -55,7 +55,7 @@ run_hook () addon_dir="${BOOT_MOUNT}/addons" # always layer default configuration - _mnt_squashfs "${addon_dir}/default-config.sqfs" + _mnt_squashfs "${addon_dir}/overlay.sqfs" if [ -e "${addon_dir}/config" ]; then msg ":: Mounting addons" diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 52087fa..193c51a 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -1,7 +1,7 @@ #!/bin/bash CPIOCONFIG="$(pwd)/archiso-mkinitcpio.conf" -DEF_CONFIG_DIR="$(pwd)/default-config" +DEF_CONFIG_DIR="$(pwd)/overlay" PKGFILE="$(pwd)/packages.list" PKGLIST="" QUIET="y" @@ -28,8 +28,8 @@ usage () echo " -v Enable verbose output." echo " -h This message." echo " commands:" - echo " install <working dir> : where to build the image root" - echo " squash <working dir> : generate a squashfs image of the installed root" + echo " install <working dir> : where to build the image root" + echo " squash <working dir> : generate a squashfs image of the installed root" echo " img <working dir> <image name> : build an image from the working directory" echo " all <working dir> <image name> : perform all of the above, in order" exit $1 @@ -171,11 +171,11 @@ if [ "${command_name}" = "install" -o "${command_name}" = "all" ]; then fi # always make an addon out of DEF_CONFIG_DIR - echo "Creating default-config addon..." + echo "Creating default overlay..." if [ "${QUIET}" = "y" ]; then - mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/default-config.sqfs" -noappend >/dev/null + mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/overlay.sqfs" -noappend >/dev/null else - mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/default-config.sqfs" -noappend + mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/overlay.sqfs" -noappend fi fi |