aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbootstrap4
-rw-r--r--bootstrap.txt11
-rwxr-xr-xinit8
3 files changed, 12 insertions, 11 deletions
diff --git a/bootstrap b/bootstrap
index 24e8749..45a122c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -51,7 +51,7 @@ mirror="http://deb.debian.org/debian/"
base_pkgs="locales,klibc-utils,sudo,systemd-container,udev"
base_pkgs+=",kmod,linux-base,firmware-linux-free,irqbalance"
base_pkgs+=",intel-microcode,amd64-microcode"
-base_pkgs+=",pciutils,usbutils,dmidecode"
+base_pkgs+=",pciutils,usbutils,dmidecode,cpuid"
base_pkgs+=",hdparm,btrfs-progs"
base_pkgs+=",lm-sensors,smartmontools"
@@ -69,7 +69,7 @@ base_pkgs+=",qemu-kvm,qemu-utils,socat"
base_pkgs+=",g++,make,pkg-config"
-extra_pkgs="cpuid"
+extra_pkgs=""
owd="$(pwd)"
trap "{ cd '$owd'; exit 1; }" ERR
diff --git a/bootstrap.txt b/bootstrap.txt
index 025c4bf..2554d43 100644
--- a/bootstrap.txt
+++ b/bootstrap.txt
@@ -15,20 +15,21 @@
* Examining init changes:
- - Get the latest initramfs-tools-core and udev packages
- - Extract /usr/share/initramfs-tools/{scripts,init} into new directory
+ - Get the latest initramfs-tools-core and udev packages.
+ - Extract /usr/share/initramfs-tools/{scripts,init} into new directory.
- Compare:
diff -urw <old> <new>
- We currently only use init plus udev in scripts/init-{top,bottom}
+ We currently only use init plus udev in scripts/init-{top,bottom}.
* Grep for 'bug' in init and bootstrap scripts, see if any bugs have
been fixed and corresponding workarounds can be removed.
-* Upgrade to latest debootstrap/keyrings from unstable (or testing).
+* Upgrade to latest debootstrap and debian-archive-keyring from unstable
+ (or testing).
-* Note: as of latest attempt, bootstrap over https was still broken
+* Note: as of latest attempt, bootstrap over https was still broken.
* Bootstrap:
diff --git a/init b/init
index a0edb50..bc1452c 100755
--- a/init
+++ b/init
@@ -22,7 +22,7 @@ function error ()
#
info "type Ctrl-D to exit shell and reboot"
setsid /bin/bash -c "exec /bin/bash -i <>/dev/tty1 1>&0 2>&1"
- reboot
+ reboot -f
}
# Some pre-systemd utilities (like reboot) come from klibc-utils.
@@ -40,7 +40,7 @@ mount -t proc -o nodev,noexec,nosuid proc /proc
info "init starting up..."
-mount -t devtmpfs -o nosuid,mode=0755 udev /dev
+mount -t devtmpfs -o noexec,nosuid,mode=0755 udev /dev
mkdir -p /dev/pts
mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts || true
@@ -49,10 +49,10 @@ mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts || true
# toolchain.
#
mkdir -p /run
-mount -t tmpfs -o "noexec,nosuid,size=512M,mode=0755" tmpfs /run
+mount -t tmpfs -o nodev,noexec,nosuid,size=512M,mode=0755 tmpfs /run
mkdir -p /tmp
-mount -t tmpfs -o "nodev,nosuid,size=2G,mode=1777" tmpfs /tmp
+mount -t tmpfs -o nodev,nosuid,size=2G,mode=1777 tmpfs /tmp
# Start udev.
#