diff options
| -rw-r--r-- | preseed.cfg | 4 | ||||
| -rwxr-xr-x | preseed.sh | 14 | ||||
| -rw-r--r-- | src/fripost-partman-udeb/base.sh | 7 |
3 files changed, 13 insertions, 12 deletions
diff --git a/preseed.cfg b/preseed.cfg index 7856628..592474e 100644 --- a/preseed.cfg +++ b/preseed.cfg @@ -45,7 +45,9 @@ d-i base-installer/kernel/image string linux-image-amd64 d-i base-installer/kernel/linux/initramfs-generators string initramfs-tools # A subset of 'standard' is interesting: tasksel --task-packages standard tasksel tasksel/first string -d-i pkgsel/include string curl bind9-host git heirloom-mailx python-apt \ +d-i pkgsel/include string git heirloom-mailx python-apt etckeeper \ + bash bash-completion \ + bind9-host curl screen \ postfix vim-nox emacs23-nox d-i pkgsel/upgrade select safe-upgrade @@ -53,17 +53,17 @@ packages="dists/$dist/main/debian-installer/binary-$arch/Packages" while [ $# -gt 0 ]; do cd "${1%%_*}-udeb"; shift name="$(sed -n 's/Package:\s\s*//p' ./debian/control)" - udeb=$(cut -d' ' -f1,1 ./debian/files) + udeb=$(cut -d' ' -f1 ./debian/files) dir="pool/main/$(expr substr "$name" 1 1)/$name" mkdir -p "$isoeditdir/$dir/" cp ../"$udeb" "$isoeditdir/$dir/" - cat "./debian/$name/DEBIAN/control" >> "$isoeditdir/$packages" - echo "Filename: $dir/$udeb" >> "$isoeditdir/$packages" - echo "MD5sum: $(md5sum ../"$udeb" | cut -d' ' -f1,1)" >> "$isoeditdir/$packages" - echo "SHA1: $(sha1sum ../"$udeb" | cut -d' ' -f1,1)" >> "$isoeditdir/$packages" - echo "SHA256: $(sha256sum ../"$udeb" | cut -d' ' -f1,1)" >> "$isoeditdir/$packages" - echo >> "$isoeditdir/$packages" + cat "./debian/$name/DEBIAN/control" >> "$isoeditdir/$packages" + echo "Filename: $dir/$udeb" >> "$isoeditdir/$packages" + echo "MD5sum: $(md5sum ../"$udeb" | cut -d' ' -f1)" >> "$isoeditdir/$packages" + echo "SHA1: $(sha1sum ../"$udeb" | cut -d' ' -f1)" >> "$isoeditdir/$packages" + echo "SHA256: $(sha256sum ../"$udeb" | cut -d' ' -f1)" >> "$isoeditdir/$packages" + echo >> "$isoeditdir/$packages" cd "$isoeditdir" md5sum "./$dir/$udeb" >> "$isoeditdir/md5sum.txt" diff --git a/src/fripost-partman-udeb/base.sh b/src/fripost-partman-udeb/base.sh index 114e678..691ff32 100644 --- a/src/fripost-partman-udeb/base.sh +++ b/src/fripost-partman-udeb/base.sh @@ -15,12 +15,12 @@ true ${DEBIAN_HAS_FRONTEND:=} ${DEBCONF_REDIR:=} # Log a message. log() { - logger -t fripost -- "$@" + logger -t fripost -p syslog.info -- "$@" } # Log a fatal error and quit. fatal() { - logger -t fripost -p user.err -- "$@" + logger -t fripost -p syslog.err -- "$@" exit 1 } @@ -274,8 +274,7 @@ fripost_encrypt() { fi # Load dm-crypt - /sbin/dmsetup targets | cut -d' ' -f1 | grep -q '^crypt$' \ - || /sbin/modprobe -v dm_crypt + /sbin/dmsetup targets | grep -q '^crypt\s' || /sbin/modprobe -v dm_crypt log "cryptsetup options: $@" db_progress START 0 100 fripost/cryptsetup-genkey_progress_title |