Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init

2 files changed, 35 insertions, 33 deletions

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 27e62304..276630ae 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -35,12 +35,15 @@ _parse_dracut_args() {
         logging.set_level "$level"
         logging.set_commands_level debug
     done
+    $debug
+    return $?
 }
-_parse_dracut_args ${dracut_args[*]}
+_debug=0
+_parse_dracut_args ${dracut_args[*]} || _debug=$?
+
 clean() {
     # NOTE: This method is currently triggered manually and not supported by
     # dracut itself.
-
     build_clean_xmount "$moddir/binaries/xmount/"
     build_clean_qemu_xmount "$moddir/binaries/qemu-xmount/"
     build_clean_dnbd3 "$moddir/binaries/dnbd3/"
@@ -101,37 +104,20 @@ check() {
 
     exceptions.deactivate
 
-    # Tell dracut that this module should only be included if is required
+    # Tell dracut that this module should only be included if it is required
     # explicitly.
     return 255
 }
 
 depends() {
-    # DEBUG: echo base network bash kernel-modules systemd-initrd dracut-systemd fs-lib rootfs-block
-    echo base network bash kernel-modules shutdown
     # NOTE: btrfs module should be used if it would work.
+    echo base network bash kernel-modules shutdown
 }
 
 installkernel() {
     inst "$moddir/binaries/dnbd3/build/dnbd3.ko" \
         /usr/lib/modules/current/extra/dnbd3.ko
-
-    # Debugging:
-    instmods cfg80211 rfkill vboxsf nls_iso8859_1 ppdev nls_cp437 iosf_mbi \
-        vfat fat snd_intel8x0 crct10dif_pclmul crc32_pclmul input_leds \
-        led_class aesni_intel evdev aes_x86_64 lrw joydev gf128mul \
-        snd_ac97_codec glue_helper ablk_helper cryptd psmouse ac97_bus \
-        snd_pcm vboxvideo mousedev serio_raw pcspkr mac_hid snd_timer battery \
-        video snd ac acpi_cpufreq processor button parport_pc e1000 parport \
-        drm intel_agp soundcore intel_gtt vboxguest i2c_piix4 sch_fq_codel \
-        ip_tables x_tables hid_generic usbhid hid xor raid6_pq sr_mod \
-        cdrom sd_mod ata_generic pata_acpi atkbd libps2 i8042 serio ohci_pci \
-        ohci_hcd crc32c_intel usbcore ahci usb_common libahci ata_piix libata \
-        scsi_mod \
-        ext4 dm_snapshot btrfs crc32c
-    # Production:
-    # instmods ext4 dm_snapshot btrfs crc32c
-    # NOTE: btrfs crc32c should usually be included by the btrfs dracut module.
+    instmods dm_snapshot btrfs crc32c
 }
 
 install() {
@@ -227,17 +213,33 @@ install() {
 
     # endregion
 
-    # Debugging:
-    inst_multiple lsblk ping ip ifconfig sshd htop tail head vim touch sed \
-        lsmod sleep route wget find lsof strace chroot switch_root pivot_root \
-        mount fdisk mkfs.xfs env busybox ps agetty tree \
-        insmod blockdev partx dmsetup sed cut awk tr insmod \
-        blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
-        basename dirname sort mktemp diff qemu-img genfstab mountpoint
-    # Production:
-    # inst_multiple insmod blockdev partx dmsetup sed cat cut awk tr touch \
-    #     losetup grep basename dirname mktemp diff sleep wget mount sort \
-    #     qemu-nbd bash genfstab mountpoint dd
+    inst_multiple \
+        awk \
+        basename \
+        bash \
+        blockdev \
+        cat \
+        cut \
+        dd \
+        diff \
+        dirname \
+        dmsetup \
+        find \
+        genfstab \
+        grep \
+        insmod \
+        losetup \
+        lsblk \
+        mktemp \
+        mount \
+        mountpoint \
+        qemu-img \
+        sed \
+        sleep \
+        sort \
+        touch \
+        tr \
+        wget
 }
 
 # region vim modline
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
-Subproject b1dee276b8e185b4df5d276e2ff5b5d5a08204a
+Subproject 49983fd95b737e8d5b92a7b559e5ac5fdda4a59