summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xsrc/selfstrap4
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1ed07ed..5d3d924 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ samizdat-pinentry: src/samizdat-pinentry.c
17wait_for_files: src/wait_for_files.c 17wait_for_files: src/wait_for_files.c
18 $(CC) $(CFLAGS) $< -o $@ 18 $(CC) $(CFLAGS) $< -o $@
19 19
20bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh) samizdat-paths.sh ${cc_files} ${btrfs_utils} 20bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh selfstrap) samizdat-paths.sh ${cc_files} ${btrfs_utils}
21 21
22btrfs_utils=$(addprefix src/btrfs-utils/, btarfs btrfs-shrink with-btrfs-seed) 22btrfs_utils=$(addprefix src/btrfs-utils/, btarfs btrfs-shrink with-btrfs-seed)
23 23
diff --git a/src/selfstrap b/src/selfstrap
index 72fda34..4492d67 100755
--- a/src/selfstrap
+++ b/src/selfstrap
@@ -16,17 +16,19 @@ usage()
16 --chroot=<prog> Use prog for chroot command 16 --chroot=<prog> Use prog for chroot command
17 --packages=<file> Text file contains names of packages to install 17 --packages=<file> Text file contains names of packages to install
18 --real-apt Use 'apt-get install' to install packages 18 --real-apt Use 'apt-get install' to install packages
19 --skip-update Do not run 'apt-get update' at startup
19EOF 20EOF
20 exit ${1:-1} 21 exit ${1:-1}
21} 22}
22 23
23GETOPT=$(getopt -n "${0##*/}" -o t:hv --long help,target:,verbose,unpack,chroot:,packages:,real-apt -- "$@") || exit 24GETOPT=$(getopt -n "${0##*/}" -o t:hv --long help,target:,verbose,unpack,chroot:,packages:,real-apt,skip-update -- "$@") || exit
24eval set -- "$GETOPT" 25eval set -- "$GETOPT"
25while [ $# -gt 0 ]; do 26while [ $# -gt 0 ]; do
26 case "$1" in 27 case "$1" in
27 -t|--target) TARGET=$2; shift ;; 28 -t|--target) TARGET=$2; shift ;;
28 -h|--help) usage 0 ;; 29 -h|--help) usage 0 ;;
29 -v|--verbose) VERBOSE=y ;; 30 -v|--verbose) VERBOSE=y ;;
31 --skip-update) SKIP_UPDATE=y ;;
30 --unpack) UNPACK_ONLY=y; die 'unimplemented' ;; 32 --unpack) UNPACK_ONLY=y; die 'unimplemented' ;;
31 --packages) x=$(cat < "$2") || die "could not read file '$2'" 33 --packages) x=$(cat < "$2") || die "could not read file '$2'"
32 EXTRA_PACKAGES="$EXTRA_PACKAGES $x" 34 EXTRA_PACKAGES="$EXTRA_PACKAGES $x"