commit 4cc939bb48b633bafb7d724b8a4f912273b49aa4
parent fcf4c8459cf310b7ac7f73e06630488f0c67eb05
Author: parazyd <parazyd@dyne.org>
Date: Thu, 9 Jun 2016 10:15:57 +0200
fstab; fixes
Diffstat:
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zlibs/debootstrap b/zlibs/debootstrap
@@ -88,7 +88,7 @@ rm -f /thirdstage.sh
rm -f /etc/ssh/*key
rm -f /etc/ssh/*.pub
rm -f /root/.bash_history
-
+rm -f /usr/bin/qemu*
# our file for which we check the bootstrap is complete
echo "1" > .done
EOF
diff --git a/zlibs/imaging b/zlibs/imaging
@@ -63,8 +63,8 @@ img_partition_dos() {
notice "Partitioning with dos"
silly
- dos_boot_size=(ext2 0 64)
- dos_root_size=(ext4 64 -1)
+ parted_boot=${parted_boot:-ext2 0 64}
+ parted_root=${parted_root:-ext4 64 -1}
pushd ${workdir}
diff --git a/zlibs/sysconf b/zlibs/sysconf
@@ -155,7 +155,7 @@ cat <<EOF
# version 9.2.0
-# Exclude some system files. These are required, and you probably
+# Exclude some system files. These are required, and you probably
# shouldn't change them.
- /dev/*
@@ -186,9 +186,9 @@ cat <<EOF
- /etc/initramfs-tools/conf.d/cryptroot # see remove-cryptroot and nocrypt.sh
- /home/snapshot
-# Added for newer version of live-config/live-boot in wheezy
+# Added for newer version of live-config/live-boot in wheezy
# These are only relevant here if you create a snapshot while
-# you're running a live-CD or live-usb.
+# you're running a live-CD or live-usb.
- /lib/live/overlay
- /lib/live/image
- /lib/live/rootfs
@@ -302,7 +302,7 @@ cat <<EOF
- /home/devuan/[a-zA-Z0-9]*
###
-### ignore the symlink /initrd.img -> /boot/initrd.img-`uname -r`
+### ignore the symlink /initrd.img -> /boot/initrd.img-`uname -r`
### -- KatolaZ -- 2016-05-21
###
