summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2016-02-04 12:53:30 +0100
committertorben2016-02-04 12:53:30 +0100
commit3f4043caace345b59fe2133447788f7c330efe0c (patch)
tree7231b90a9372083493b7713d9903d83b96b434a4
parentrefactor. (diff)
downloadsystemd-init-3f4043caace345b59fe2133447788f7c330efe0c.tar.gz
systemd-init-3f4043caace345b59fe2133447788f7c330efe0c.tar.xz
systemd-init-3f4043caace345b59fe2133447788f7c330efe0c.zip
Make brd kernel module use more resilient.
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/prepare-root-partition.sh1
-rwxr-xr-xdev-tools/openslxTFTPRoot/pxelinux.cfg/default2
2 files changed, 2 insertions, 1 deletions
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index 71d64b3a..ffa7fbcf 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -41,6 +41,7 @@ else
if [ "$ramdisk_size" = "" ]; then
ramdisk_size="$(cat /proc/meminfo | awk '/MemTotal/ {print $2}')"
fi
+ ! rmmod brd 2>/dev/null
modprobe brd max_part=1 rd_size="$ramdisk_size"
writable_device='/dev/ram0'
persistent='N'
diff --git a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default
index 16135097..8968ad50 100755
--- a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default
+++ b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default
@@ -96,7 +96,7 @@ LABEL net
MENU LABEL ^ubuntu Torben debug
KERNEL http://132.230.4.201:8080/ubuntu/vmlinuz-linux
INITRD http://132.230.4.201:8080/ubuntu/initramfs-test.img
- APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=ubuntu/
+ APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=ubuntu/ brd.rd_size=2097152
SYSAPPEND 2
IPAPPEND 3
MENU DEFAULT