summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2015-11-05 16:44:10 +0100
committertorben2015-11-05 16:44:10 +0100
commitc8335c43ed8dd50347ff4d6fa8538fd07a65054d (patch)
tree412c1c1f64651219cf625184718ca078ebd30250
parentfix (diff)
downloadsystemd-init-c8335c43ed8dd50347ff4d6fa8538fd07a65054d.tar.gz
systemd-init-c8335c43ed8dd50347ff4d6fa8538fd07a65054d.tar.xz
systemd-init-c8335c43ed8dd50347ff4d6fa8538fd07a65054d.zip
Fixes. Sync.
-rwxr-xr-xbuilder/build-initramfs.sh3
-rwxr-xr-xbuilder/dnbd3-rootfs/module-setup.sh4
2 files changed, 1 insertions, 6 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 938089d6..a08ca403 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -232,7 +232,7 @@ EOF
build_initramfs_initialize_dracut
fi
utils_log 'Build initramfs.' && \
- utils_log 'Copy dnbd3 qcow2 plugin into dracut modules folder.' && \
+ utils_log 'Copy dnbd3 plugin into dracut modules folder.' && \
cp --recursive dnbd3-rootfs/ dracut/modules.d/90dndb3-rootfs \
1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
dracut/dracut.sh --local --verbose --force \
@@ -247,7 +247,6 @@ EOF
# region footer
-echo A "$0" *"${__NAME__}.sh"
if [[ "$0" == *"${__NAME__}.sh" || $(echo "$@" | grep --extended-regexp \
'(^| )(-l|--load-environment)($| )') ]]
then
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 672c1b3e..1efc6c3f 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -56,18 +56,14 @@ install() {
# endregion
## TODO deprecated
- ### SCRIPTS
# the main magic script containing all the functions needed
# to prepare the qcow2-based root filesystem
#inst "$moddir/scripts/setup-qcow2" /sbin/setup-qcow2
- #
# the script triggered by udev upon finding the right partitions
#inst "$moddir/scripts/prepare-disks" /sbin/prepare-disks
- ##
# udev rules detecting 44, 45, 46 partitions and running
# 'prepare-disks' to do then format/mount/use them
#inst "$moddir/udev/70-openslx-disk.rules" /etc/udev/rules.d/70-openslx-disk.rules
- ##
# Debugging Uncomment this version if you need some useful debugging tools
# in your iniramfs.