From f0629e71b6cd2d557826e1dd7d5d16266c6aada2 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 6 May 2015 18:18:44 +0200 Subject: oops --- testModule/hooks/cmdline.sh | 22 --------------------- testModule/hooks/mount.sh | 3 --- testModule/hooks/nbd-cmdline.sh | 5 ----- testModule/hooks/pre-mount.sh | 9 --------- testModule/hooks/pre-udev.sh | 44 ----------------------------------------- 5 files changed, 83 deletions(-) delete mode 100755 testModule/hooks/cmdline.sh delete mode 100755 testModule/hooks/mount.sh delete mode 100755 testModule/hooks/nbd-cmdline.sh delete mode 100755 testModule/hooks/pre-mount.sh delete mode 100755 testModule/hooks/pre-udev.sh (limited to 'testModule') diff --git a/testModule/hooks/cmdline.sh b/testModule/hooks/cmdline.sh deleted file mode 100755 index b1f06ea6..00000000 --- a/testModule/hooks/cmdline.sh +++ /dev/null @@ -1,22 +0,0 @@ -echo 1 > /proc/sys/kernel/sysrq - -# fakes the cmdline to fix the ip parsing when using -# syslinux's IPAPPEND 1 mask -[ -d /fake ] || mkdir /fake - -# need to be a tmpfs for the hack to work -mount -t tmpfs tmpfs /fake - -# append ':hiwi:eth0:none' to the 'ip=' parameter we got -# from syslinux's IPAPPEND 1 -sed 's/\(ip=\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}:\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}:\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}:\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\)/\1:hiwi:eno1:none/' /proc/cmdline > /fake/cmdline - -# bind mount it. Can we trust mount return codes here? -# if so, we should check what we get in $? -mount -o bind /fake/cmdline /proc/cmdline - -# check if it worked -if ! grep 'hiwi:eth0:none' /proc/cmdline; then - command -v warn >/dev/null || . /lib/dracut-lib.sh - warn 'Haxing cmdline did not work :( sad pandaz...' -fi diff --git a/testModule/hooks/mount.sh b/testModule/hooks/mount.sh deleted file mode 100755 index e893642d..00000000 --- a/testModule/hooks/mount.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -mount /dev/root $NEWROOT diff --git a/testModule/hooks/nbd-cmdline.sh b/testModule/hooks/nbd-cmdline.sh deleted file mode 100755 index 6464646f..00000000 --- a/testModule/hooks/nbd-cmdline.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -rootok=1 -root=block:/dev/root - diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh deleted file mode 100755 index b22cdc35..00000000 --- a/testModule/hooks/pre-mount.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/bash - -while ! /sbin/setup-qcow2; do - sleep 0.5 -done - -while ! /sbin/setup-nbdroot; do - sleep 0.5 -done diff --git a/testModule/hooks/pre-udev.sh b/testModule/hooks/pre-udev.sh deleted file mode 100755 index 578169e9..00000000 --- a/testModule/hooks/pre-udev.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/bash - -# include dracut-lib.sh to use 'warn' -command -v warn >/dev/null || . /lib/dracut-lib.sh - -SETUP_SCRIPT="/sbin/setup-qcow2" -NBDROOT_SCRIPT="/sbin/setup-nbdroot" -NBD_MOD_PATH="/usr/lib/modules/current/extra/nbd.ko" -DNBD3_MOD_PATH="/usr/lib/modules/current/extra/dnbd3.ko" - -# sanity checks -if [ ! -e "${SETUP_SCRIPT}" ]; then - warn "No such file of directory: ${SETUP_SCRIPT}" - emergency_shell -n "Error in $0" - return 1 -fi -if [ ! -e "${NBD_MOD_PATH}" ]; then - warn "No such file of directory: ${NBD_MOD_PATH}" - emergency_shell -n "Error in $0" - return 1 -fi -if [ ! -e "${DNBD3_MOD_PATH}" ]; then - warn "No such file of directory: ${DNBD3_MOD_PATH}" - emergency_shell -n "Error in $0" - return 1 -fi - -# load the kernel modules for dnbd3 and nbd -if ! insmod /usr/lib/modules/current/extra/dnbd3.ko; then - warn "Failed to load DNBD3 kernel module..." - emergency_shell -n "Error in $0" - return 1 -fi - -if ! insmod /usr/lib/modules/current/extra/nbd.ko; then - warn "Failed to load NBD kernel module..." - emergency_shell -n "Error in $0" - return 1 -fi - -# now let's "install" the setup script in the initqueue -#/sbin/initqueue --settled --unique "${SETUP_SCRIPT}" -#/sbin/initqueue --settled --unique "${NBDROOT_SCRIPT}" -#/sbin/initqueue --settled --unique "/sbin/retry-nbdroot" -- cgit v1.2.3-55-g7522