diff options
| author | Simon Rettberg | 2017-05-08 13:52:36 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-05-08 13:52:36 +0200 |
| commit | 440e568be3f47e148a85c664c366a9519b93ba1b (patch) | |
| tree | 65fc8181549ebd9949d695baf4d5bc059531ad72 | |
| parent | [run-virt] Increase mem reserved for host if using nvidia drivers (diff) | |
| download | mltk-440e568be3f47e148a85c664c366a9519b93ba1b.tar.gz mltk-440e568be3f47e148a85c664c366a9519b93ba1b.tar.xz mltk-440e568be3f47e148a85c664c366a9519b93ba1b.zip | |
[rfs-stage32] Require gawk
| -rwxr-xr-x | core/rootfs/rootfs-stage31/data/init | 28 | ||||
| -rw-r--r-- | core/rootfs/rootfs-stage32/module.conf.ubuntu | 1 |
2 files changed, 16 insertions, 13 deletions
diff --git a/core/rootfs/rootfs-stage31/data/init b/core/rootfs/rootfs-stage31/data/init index 98ee1a61..8ee2baa9 100755 --- a/core/rootfs/rootfs-stage31/data/init +++ b/core/rootfs/rootfs-stage31/data/init @@ -16,10 +16,25 @@ # set PATH correctly export PATH=/bin:/sbin:/usr/bin:/usr/sbin +# import common functions +. "/inc/functions" + +# mount the important standard directories +[ ! -f /proc/cpuinfo ] && busybox mount -n -t proc proc /proc +bench_event "KERNEL" "Kernel initialized" +[ ! -d /sys/class ] && busybox mount -n -t sysfs sysfs /sys + +# NOTE: busybox mount is only available through the busybox binary, +# the link had to be dropped, to prevent bugs in the stage32. +busybox mount -n -t devtmpfs -o 'rw,relatime,nosuid,noexec,mode=0755' initramfsdevs /dev +busybox mount -n -t tmpfs -o 'mode=755' run "/run" + # IMPORTANT - check if kernel modules in initrams match kernel version BASEDIR="/lib/modules/$(uname -r)/kernel/drivers" for dir in gpu hid misc; do if ! [ -d "$BASEDIR/$dir" ]; then + echo "0" > /proc/sys/kernel/printk + reset cat <<WARNING + + @@ -49,19 +64,6 @@ WARNING fi done -# import common functions -. "/inc/functions" - -# mount the important standard directories -[ ! -f /proc/cpuinfo ] && busybox mount -n -t proc proc /proc -bench_event "KERNEL" "Kernel initialized" -[ ! -d /sys/class ] && busybox mount -n -t sysfs sysfs /sys - -# NOTE: busybox mount is only available through the busybox binary, -# the link had to be dropped, to prevent bugs in the stage32. -busybox mount -n -t devtmpfs -o 'rw,relatime,nosuid,noexec,mode=0755' initramfsdevs /dev -busybox mount -n -t tmpfs -o 'mode=755' run "/run" - # preparations for mounting stage3.2 FUTURE_ROOT="/dev/shm/uniontmp" mkdir -p "$FUTURE_ROOT" /rorootfs diff --git a/core/rootfs/rootfs-stage32/module.conf.ubuntu b/core/rootfs/rootfs-stage32/module.conf.ubuntu index 52ddd163..99ce5923 100644 --- a/core/rootfs/rootfs-stage32/module.conf.ubuntu +++ b/core/rootfs/rootfs-stage32/module.conf.ubuntu @@ -6,6 +6,7 @@ REQUIRED_INSTALLED_PACKAGES=" xfsprogs curl openssl + gawk " REQUIRED_CONTENT_PACKAGES=" openssl |