merge

5 files changed, 40 insertions, 30 deletions

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index cd7211ee..cb85a86e 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # -*- coding: utf-8 -*-
 
-# region header
+# region header 
 
 # Copyright Torben Sickert (t.sickert["~at~"]gmail.com) 29.10.2015
 #           Janosch Dobler (TODO) 29.10.2015
@@ -59,7 +59,10 @@ core.import logging
 core.import utils
 core.import exceptions
 
-exceptions.init
+exceptions.activate
+
+logging.set_commands_log_level debug
+logging.set_log_level critical
 
 # region properties
 
@@ -68,7 +71,7 @@ build_initramfs_debug='no'
 build_initramfs_create_system_image=''
 build_initramfs_cleanup='no'
 build_initramfs_dependencies=(bash cpio git test shift echo mktemp cat rm sed \
-    gzip curl tar grep make gcc cmake)
+    gzip curl tar grep make gcc cmake readlink dirname)
 
 # endregion
 
@@ -103,8 +106,6 @@ function build_initramfs_print_command_line_option_description() {
 -c --cleanup Removes all distribution specific compiled files.
 
 -i --create-system-image Creates an image under given path from current system.
-
--c --create-system-image Creates a system image file for given path
     (default: "$build_initramfs_create_system_image").
 EOF
 }
@@ -146,6 +147,10 @@ function build_initramfs_parse_command_line() {
             -i|--create-system-image)
                 shift
                 build_initramfs_create_system_image="$1"
+                if [[ "$build_initramfs_create_system_image" == '' ]]; then
+                    logging.critical "This options needs a path to save image to."
+                    return 1
+                fi
                 shift
                 ;;
 
@@ -209,7 +214,10 @@ function build_initramfs_cleanup() {
     # Examples:
     #
     # >>> build_initramfs_cleanup
-    echo TODO
+    source dnbd3-rootfs/module-setup.sh
+    moddir="$(dirname "$(readlink --canonicalize \
+        dnbd3-rootfs/module-setup.sh)")"
+    clean
     return $?
 }
 
@@ -270,6 +278,7 @@ else
         "$build_initramfs__modules" --no-hostonly /boot/initramfs-test.img
 fi
 logging.info 'Done!'
+exceptions.deactivate
 
 # endregion
 
diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
index 70c4e1a7..38817dea 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
@@ -34,49 +34,49 @@ udevadm settle
 
 local read_only_partition=$(utils.find_block_device \
     "$SLX_SYSTEM_PARTITION_IDENTIFIER")
-if [ -z $read_only_partition ]; then
-    warn no partition found on device $nbd_device
+if [ -z "$read_only_partition" ]; then
+    warn no partition found on device "$nbd_device"
     emergency_shell
 fi
 # Make read-only partition writable.
 ## detect partition for persistent storage
-local persistent_device=$(utils.find_block_device \
-    "$SLX_WRITABLE_DEVICE_IDENTIFIER")
+local persistent_device="$(utils.find_block_device \
+    "$SLX_WRITABLE_DEVICE_IDENTIFIER")"
 # TODO move somewhere else
-#local tmp_device=$(utils.find_block_device \
-    #'$SLX_TMP_PARTITION_IDENTIFIER')
+#local tmp_device="$(utils.find_block_device \
+    #'$SLX_TMP_PARTITION_IDENTIFIER')"
 
 #if [ -n $tmp_device ]; then
-    #mount -t auto "$tmp_device" $NEWROOT/tmp
+    #mount --type auto "$tmp_device" "$NEWROOT/tmp"
 #fi
 
-local persistent="N" # 'P' for persistent storage, 'N' for not persistent
+local persistent='N' # 'P' for persistent storage, 'N' for not persistent
 local writable_device
 if [ -n "$persistent_device" ]; then
-    writable_device=$persistent_device
+    writable_device="$persistent_device"
     if [ "$SLX_WRITABLE_DEVICE_PERSISTENT" = "yes" ]; then
-        persistent="P"
+        persistent='P'
     fi
 else
     local ramdisk_size="$SLX_RAMDISK_SIZE"
     if [ "$ramdisk_size" = "" ]; then
-        ramdisk_size=$(cat /proc/meminfo | awk '/MemTotal/ {print $2}')
+        ramdisk_size="$(cat /proc/meminfo | awk '/MemTotal/ {print $2}')"
     fi
-    modprobe brd max_part=1 rd_size=$ramdisk_size
-    writable_device="/dev/ram0"
-    persistent="N"
+    modprobe brd max_part=1 rd_size="$ramdisk_size"
+    writable_device='/dev/ram0'
+    persistent='N'
 fi
 
 # persistent storage on a filesystem (e.g. usb stick)
 # writable_device="$(losetup -f)"
 #dd if=/dev/zero of=persistent_storage.img bs=1k count=1000
 #losetup "$writable_device" persistent_storage.img
-#persistent="P"
+#persistent='P'
 
 local partition_size="$(blockdev --getsz "$read_only_partition")"
-local writable_partition_name="root"
+local writable_partition_name='root'
 logging.info "Using writable device $writable_device, persistency: $persistent"
-local chunksize="1"
+local chunksize='1'
 modprobe dm_snapshot
 dmsetup create "$writable_partition_name" --noudevsync --table \
     "0 $partition_size snapshot $read_only_partition $writable_device $persistent $chunksize"
diff --git a/builder/dnbd3-rootfs/hooks/pre-udev/setup-loopback-device.sh b/builder/dnbd3-rootfs/hooks/pre-udev/setup-loopback-device.sh
deleted file mode 100755
index 9103afd9..00000000
--- a/builder/dnbd3-rootfs/hooks/pre-udev/setup-loopback-device.sh
+++ /dev/null
@@ -1 +0,0 @@
-/sbin/initqueue --name ifup-lo --unique --onetime /sbin/ifup lo -m
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 9ee50ce4..2d5528f8 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -15,6 +15,7 @@ clean() {
         utils_clean_systemd_preserve_process_marker \
             "$moddir/binaries/systemd-preserve-process-marker/"
     fi
+    return 0
 }
 
 check() {
@@ -28,7 +29,7 @@ check() {
     logging_set_log_level 'info'
     logging_set_commands_log_level 'info'
 
-    # TODO uncomment if rebash is fixed: exceptions_init
+    exceptions_activate
 
     if [[ ! -f "$moddir/binaries/nbd/nbd.ko" ]]; then
         utils_compile_nbd "$moddir/binaries/nbd/"
@@ -57,6 +58,9 @@ check() {
     if [[ ! -f /usr/bin/sh ]] && [[ -f /bin/sh ]]; then
         ln --symbolic --force /bin/sh /usr/bin/sh
     fi
+
+    exceptions_deactivate
+
     return 0
 }
 
@@ -107,8 +111,6 @@ install() {
 
     # load nbd.ko, dnbd3.ko
     inst_hook pre-udev 00 "$moddir/hooks/pre-udev/load-custom-kernel-modules.sh"
-    # TODO needed?
-    inst_hook pre-udev 00 "$moddir/hooks/pre-udev/setup-loopback-device.sh"
 
     # get the openslx config from the servers configured in the kernel command
     # line (${SLX_SERVER}/${SLX_SERVER_BASE}/config)
diff --git a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default
index ba601e08..0f936e4e 100755
--- a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default
+++ b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default
@@ -60,9 +60,9 @@ LABEL shutdown
 
 LABEL net
    MENU LABEL ^Dracut TEST Torben
-   KERNEL http://132.230.4.201:8080/archLinux/archLinux-vmlinuz-linux
-   INITRD http://132.230.4.201:8080/archLinux/archLinux-initramfs-test.img
-   APPEND initrd=/archLinux-initramfs-test.img 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=archLinux/ vga=current
+   KERNEL http://132.230.4.201:8080/archLinux/vmlinuz-linux
+   INITRD http://132.230.4.201:8080/archLinux/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=archLinux/ vga=current
    SYSAPPEND 2
    IPAPPEND 3
    MENU DEFAULT