diff options
-rw-r--r-- | installer.sh.in | 5 | ||||
-rw-r--r-- | mkrootfs.sh.in | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/installer.sh.in b/installer.sh.in index 6705f09..00ae948 100644 --- a/installer.sh.in +++ b/installer.sh.in @@ -947,7 +947,10 @@ menu_source() { "Network" "Packages from official remote reposity" case "$(cat $ANSWER)" in "Local") src="local";; - "Network") src="net"; menu_network;; + "Network") src="net"; + if [ -z "$NETWORK_DONE" ]; then + menu_network; + fi;; *) return 1;; esac SOURCE_DONE=1 diff --git a/mkrootfs.sh.in b/mkrootfs.sh.in index bedcb0c..472cec9 100644 --- a/mkrootfs.sh.in +++ b/mkrootfs.sh.in @@ -56,6 +56,7 @@ Options -h Show this help -p <pkgs> Additional packages to install into the rootfs (separated by blanks) -r <repo> Set XBPS repository (may be set multiple times) + -k <cmd> Call "cmd <ROOTFSPATH>" after building the rootfs -V Show version _EOF } @@ -104,7 +105,7 @@ register_binfmt() { # # main() # -while getopts "b:C:c:hp:r:V" opt; do +while getopts "b:C:c:hp:r:k:V" opt; do case $opt in b) PKGBASE="$OPTARG";; C) XBPS_CONFFILE="-C $OPTARG";; @@ -112,6 +113,7 @@ while getopts "b:C:c:hp:r:V" opt; do h) usage; exit 0;; p) EXTRA_PKGS="$OPTARG";; r) XBPS_REPOSITORY="$XBPS_REPOSITORY --repository=$OPTARG";; + k) POST_HOOK="$OPTARG";; V) echo "$PROGNAME @@MKLIVE_VERSION@@"; exit 0;; esac done @@ -226,6 +228,9 @@ fi # Setup default root password. # run_cmd "chroot $rootfs sh -c 'echo "root:voidlinux" | chpasswd -c SHA512'" +if [ -n "$POST_HOOK" ]; then + run_cmd "$POST_HOOK $rootfs" +fi umount_pseudofs # # Cleanup rootfs. |