rename sosreport to rdsosreport

Renamed sosreport to rdsosreport to differ from the sosreport tool on
the real root.

diff --git a/dracut.8.asc b/dracut.8.asc
index 8b50782..f5199b0 100644 (file)
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -31,10 +31,10 @@ early userspace.
 For a complete list of kernel command line options see *dracut.cmdline*(7).
 
 If you are dropped to an emergency shell, while booting your initramfs,
-the file _/run/initramfs/sosreport.txt_ is created, which can be safed to a
+the file _/run/initramfs/rdsosreport.txt_ is created, which can be safed to a
 (to be mounted by hand) partition (usually /boot) or a USB stick.
 Additional debugging info can be produced by adding **rd.debug** to the kernel command line.
-_/run/initramfs/sosreport.txt_ contains all logs and the output of some tools.
+_/run/initramfs/rdsosreport.txt_ contains all logs and the output of some tools.
 It should be attached to any report about dracut problems.
 
 EXAMPLE

diff --git a/dracut.asc b/dracut.asc
index 359824f..4de3dbf 100644 (file)
--- a/dracut.asc
+++ b/dracut.asc
@@ -489,7 +489,7 @@ dracut shell commands are printed as they are executed
 ----
 # journalctl -ab
 ----
-. With dracut >= 025 the file /run/initramfs/sosreport.txt is generated, which contains all the logs and the output of all significant tools, which are mentioned later.
+. With dracut >= 025 the file /run/initramfs/rdsosreport.txt is generated, which contains all the logs and the output of all significant tools, which are mentioned later.
 
 If you want to save that output, simply mount /boot by hand or insert an USB stick and mount that.
 Then you can store the output for later inspection.

diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index c1a570c..cf11d50 100644 (file)
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -128,10 +128,10 @@ Misc
 [[dracutkerneldebug]]
 Debug
 ~~~~~
-If you are dropped to an emergency shell, the file _/run/initramfs/sosreport.txt_ is created,
+If you are dropped to an emergency shell, the file _/run/initramfs/rdsosreport.txt_ is created,
 which can be safed to a (to be mounted by hand) partition (usually /boot) or a USB stick.
 Additional debugging info can be produced by adding **rd.debug** to the kernel command line.
-_/run/initramfs/sosreport.txt_ contains all logs and the output of some tools.
+_/run/initramfs/rdsosreport.txt_ contains all logs and the output of some tools.
 It should be attached to any report about dracut problems.
 
 **rd.info**::

diff --git a/modules.d/98systemd/dracut-emergency.sh b/modules.d/98systemd/dracut-emergency.sh
index e1da2ef..5771dc5 100755 (executable)
--- a/modules.d/98systemd/dracut-emergency.sh
+++ b/modules.d/98systemd/dracut-emergency.sh
@@ -19,12 +19,12 @@ source_hook "$hook"
 
 if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then
     echo
-    sosreport
+    rdsosreport
     echo
     echo
     echo 'Entering emergency mode. Exit the shell to continue.'
     echo 'Type "journalctl" to view system logs.'
-    echo 'You might want to save "/run/initramfs/sosreport.txt" to a USB stick or /boot'
+    echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
     echo 'after mounting them and attach it to a bug report.'
     echo
     echo

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 089d336..8eeebf3 100755 (executable)
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -939,8 +939,8 @@ _emergency_shell()
     else
         debug_off
         echo
-        /sbin/sosreport
-        echo 'You might want to save "/run/initramfs/sosreport.txt" to a USB stick or /boot'
+        /sbin/rdsosreport
+        echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
         echo 'after mounting them and attach it to a bug report.'
         if ! RD_DEBUG= getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
             echo

diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
index 57fd3bc..86bf3b4 100755 (executable)
--- a/modules.d/99base/module-setup.sh
+++ b/modules.d/99base/module-setup.sh
@@ -43,7 +43,7 @@ install() {
     inst_script "$moddir/init.sh" "/init"
     inst_script "$moddir/initqueue.sh" "/sbin/initqueue"
     inst_script "$moddir/loginit.sh" "/sbin/loginit"
-    inst_script "$moddir/sosreport.sh" "/sbin/sosreport"
+    inst_script "$moddir/rdsosreport.sh" "/sbin/rdsosreport"
 
     [ -e "${initdir}/lib" ] || mkdir -m 0755 -p ${initdir}/lib
     mkdir -m 0755 -p ${initdir}/lib/dracut

diff --git a/modules.d/99base/sosreport.sh b/modules.d/99base/rdsosreport.sh
similarity index 89%
rename from modules.d/99base/sosreport.sh
rename to modules.d/99base/rdsosreport.sh
index eb1ba80..bfa55bb 100755 (executable)
--- a/modules.d/99base/sosreport.sh
+++ b/modules.d/99base/rdsosreport.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-echo 'Generating "/run/initramfs/sosreport.txt"'
+echo 'Generating "/run/initramfs/rdsosreport.txt"'
 
 [ -d /run/initramfs ] || mkdir -p /run/initramfs
 
-exec >/run/initramfs/sosreport.txt 2>&1
+exec >/run/initramfs/rdsosreport.txt 2>&1
 
 set -x