[PATCH 0/6] Various cleanups

[PATCH 0/6] Various cleanups

[Philippe Seewer]

While debianizing dracut, debians package checker (lintian) came up with
a few errors and warnings. Since they're not debian specific at all it
makes sense to fix them.

Philippe Seewer (6):
  initqueue: Remove trailing ;
  syslog-genrules.sh: Shebang should be /bin/sh not /bin/dash
  Module scripts should be executable
  All module scripts should have a shebang
  loginit: Fix shebang
  Fix manpage display errors

 dracut.8                                         |   38 ++++++++++++++-------
 modules.d/90crypt/crypt-cleanup.sh               |    1 +
 modules.d/90crypt/parse-crypt.sh                 |    1 +
 modules.d/90dmsquash-live/parse-dmsquash-live.sh |    1 +
 modules.d/90lvm/lvm-cleanup.sh                   |    1 +
 modules.d/90mdraid/mdraid-cleanup.sh             |    1 +
 modules.d/95dasd/parse-dasd.sh                   |    1 +
 modules.d/95dasd_mod/parse-dasd-mod.sh           |    1 +
 modules.d/95iscsi/mount-lun.sh                   |    1 +
 modules.d/95zfcp/parse-zfcp.sh                   |    2 +-
 modules.d/95znet/parse-ccw.sh                    |    1 +
 modules.d/98syslog/syslog-genrules.sh            |    2 +-
 modules.d/99base/initqueue                       |    1 -
 modules.d/99base/loginit                         |    2 +-
 14 files changed, 37 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 modules.d/40network/ifname-genrules.sh
 mode change 100644 => 100755 modules.d/40network/parse-bridge.sh
 mode change 100644 => 100755 modules.d/40network/parse-ifname.sh

[PATCH 1/6] initqueue: Remove trailing ;

[Philippe Seewer]

dash -n complains about the trailing ';' and somehow I think this
really isn't needed.
---
 modules.d/99base/initqueue |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/modules.d/99base/initqueue b/modules.d/99base/initqueue
index e5246ee..cc6e7a8 100755
--- a/modules.d/99base/initqueue
+++ b/modules.d/99base/initqueue
@@ -37,5 +37,4 @@ fi
 
 mv -f "/tmp/$$-${job}.sh" "/initqueue${settled}/${job}.sh"
 [ -z "$settled" ] && >> /initqueue/work
-;
 
-- 
1.6.5.3

[PATCH 2/6] syslog-genrules.sh: Shebang should be /bin/sh not /bin/dash

[Philippe Seewer]

---
 modules.d/98syslog/syslog-genrules.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/98syslog/syslog-genrules.sh b/modules.d/98syslog/syslog-genrules.sh
index 64aa08c..8d99fb8 100755
--- a/modules.d/98syslog/syslog-genrules.sh
+++ b/modules.d/98syslog/syslog-genrules.sh
@@ -1,4 +1,4 @@
-#!/bin/dash
+#!/bin/sh
 # Creates the syslog udev rules to be triggered when interface becomes online.
 . /lib/dracut-lib.sh
 
-- 
1.6.5.3

[PATCH 3/6] Module scripts should be executable

[Philippe Seewer]

---
 0 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 modules.d/40network/ifname-genrules.sh
 mode change 100644 => 100755 modules.d/40network/parse-bridge.sh
 mode change 100644 => 100755 modules.d/40network/parse-ifname.sh

diff --git a/modules.d/40network/ifname-genrules.sh b/modules.d/40network/ifname-genrules.sh
old mode 100644
new mode 100755
diff --git a/modules.d/40network/parse-bridge.sh b/modules.d/40network/parse-bridge.sh
old mode 100644
new mode 100755
diff --git a/modules.d/40network/parse-ifname.sh b/modules.d/40network/parse-ifname.sh
old mode 100644
new mode 100755
-- 
1.6.5.3

[PATCH 4/6] All module scripts should have a shebang

[Philippe Seewer]

---
 modules.d/90crypt/crypt-cleanup.sh               |    1 +
 modules.d/90crypt/parse-crypt.sh                 |    1 +
 modules.d/90dmsquash-live/parse-dmsquash-live.sh |    1 +
 modules.d/90lvm/lvm-cleanup.sh                   |    1 +
 modules.d/90mdraid/mdraid-cleanup.sh             |    1 +
 modules.d/95dasd/parse-dasd.sh                   |    1 +
 modules.d/95dasd_mod/parse-dasd-mod.sh           |    1 +
 modules.d/95iscsi/mount-lun.sh                   |    1 +
 modules.d/95zfcp/parse-zfcp.sh                   |    2 +-
 modules.d/95znet/parse-ccw.sh                    |    1 +
 10 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/modules.d/90crypt/crypt-cleanup.sh b/modules.d/90crypt/crypt-cleanup.sh
index 1a47d47..3959a07 100755
--- a/modules.d/90crypt/crypt-cleanup.sh
+++ b/modules.d/90crypt/crypt-cleanup.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # close everything which is not busy
 for i in /dev/mapper/luks-*; do
     cryptsetup luksClose $i >/dev/null 2>&1
diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
index 789bbb0..5c2a94a 100755
--- a/modules.d/90crypt/parse-crypt.sh
+++ b/modules.d/90crypt/parse-crypt.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 if getarg rd_NO_LUKS; then
     info "rd_NO_LUKS: removing cryptoluks activation"
     rm -f /etc/udev/rules.d/70-luks.rules
diff --git a/modules.d/90dmsquash-live/parse-dmsquash-live.sh b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
index 40ca016..646da36 100755
--- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh
+++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # live images are specified with
 # root=live:backingdev
 
diff --git a/modules.d/90lvm/lvm-cleanup.sh b/modules.d/90lvm/lvm-cleanup.sh
index 6efd911..f0b4037 100755
--- a/modules.d/90lvm/lvm-cleanup.sh
+++ b/modules.d/90lvm/lvm-cleanup.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 # stop everything which is not busy
 lvm vgchange -a n >/dev/null 2>&1
diff --git a/modules.d/90mdraid/mdraid-cleanup.sh b/modules.d/90mdraid/mdraid-cleanup.sh
index dc3b86f..f4b7810 100755
--- a/modules.d/90mdraid/mdraid-cleanup.sh
+++ b/modules.d/90mdraid/mdraid-cleanup.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # stop everything which is not busy
 for i in /dev/md* /dev/md/*; do
     [ -b $i ] || continue
diff --git a/modules.d/95dasd/parse-dasd.sh b/modules.d/95dasd/parse-dasd.sh
index af58b31..47bcfe4 100755
--- a/modules.d/95dasd/parse-dasd.sh
+++ b/modules.d/95dasd/parse-dasd.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 for dasd_arg in $(getargs 'rd_DASD='); do
     (
         IFS=","
diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
index 023c9ad..63a7da4 100755
--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
+++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 [ -d /etc/modprobe.d ] || mkdir /etc/modprobe.d
 
 dasd_arg=$(getarg rd_DASD_MOD=)
diff --git a/modules.d/95iscsi/mount-lun.sh b/modules.d/95iscsi/mount-lun.sh
index ff8d4d0..d0b6458 100755
--- a/modules.d/95iscsi/mount-lun.sh
+++ b/modules.d/95iscsi/mount-lun.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 if [ -z $iscsi_lun ]; then
     iscsi_lun=0
 fi
diff --git a/modules.d/95zfcp/parse-zfcp.sh b/modules.d/95zfcp/parse-zfcp.sh
index 4f502c2..7fcee87 100755
--- a/modules.d/95zfcp/parse-zfcp.sh
+++ b/modules.d/95zfcp/parse-zfcp.sh
@@ -1,4 +1,4 @@
-
+#!/bin/sh
 getarg rd_NO_ZFCPCONF && rm /etc/zfcp.conf
 
 for zfcp_arg in $(getargs 'rd_ZFCP='); do
diff --git a/modules.d/95znet/parse-ccw.sh b/modules.d/95znet/parse-ccw.sh
index c8b257f..846c853 100755
--- a/modules.d/95znet/parse-ccw.sh
+++ b/modules.d/95znet/parse-ccw.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 for ccw_arg in $(getargs 'rd_CCW='); do
     echo $ccw_arg >> /etc/ccw.conf
 done
-- 
1.6.5.3

[PATCH 5/6] loginit: Fix shebang

[Philippe Seewer]

---
 modules.d/99base/loginit |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/99base/loginit b/modules.d/99base/loginit
index 8faa132..a777d6f 100755
--- a/modules.d/99base/loginit
+++ b/modules.d/99base/loginit
@@ -1,4 +1,4 @@
-#/bin/sh
+#!/bin/sh
 
 QUIET=$1
 
-- 
1.6.5.3

[PATCH 6/6] Fix manpage display errors

[Philippe Seewer]

Some lines in dracut's manpage are just too long for justified
display on 80c terminals. These small corrections fix this. In addition
man --warnings does not complain anymore about anything at all.
---
 dracut.8 |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/dracut.8 b/dracut.8
index 851a5ce..8303fd0 100644
--- a/dracut.8
+++ b/dracut.8
@@ -104,8 +104,9 @@ root filesystem.
 .B init=<path to real init>
 .TP
 .B root=<path to blockdevice>
-specify e.g. \fI/dev/sda1\fR or
-\fI/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1\fR
+specify blockdevice to use as root filesystem.
+e.g. \fI/dev/sda1\fR
+e.g. \fI/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1\fR
 .TP
 .B rootfstype=<filesystem type>
 "auto" if not specified, e.g. \fIrootfstype=ext3\fR
@@ -120,7 +121,9 @@ do not honor special mount options for the root filesystem found in
 /etc/fstab of the real root.
 
 .SH I18N
+.ad l
 e.g. LANG=en_US.UTF-8 SYSFONT=latarcyrheb-sun16 KEYTABLE=de-latin1-nodeadkeys
+.ad
 .TP
 .B KEYBOARDTYPE=sun|pc
 will be written to /etc/sysconfig/keyboard in the initramfs
@@ -200,6 +203,7 @@ to the specified values
 .TP
 .B rd_ZFCP=<zfcp adaptor device bus ID>,<WWPN>,<FCPLUN>
 rd_ZFCP can be specified multiple times on the kernel command line.
+
 example: rd_ZFCP=0.0.4000,0x5005076300C213e9,0x5022000000000000 
 .TP
 .B rd_NO_ZFCPCONF
@@ -208,9 +212,9 @@ ignore zfcp.conf included in the initramfs
 .SH CCW
 .TP
 .B rd_CCW=<nettype>,<subchannels>,<options>
-rd_CCW can be specified multiple times on the kernel command line.
-e.g. rd_CCW=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo
-e.g. rd_CCW=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar
+rd_CCW can be specified multiple times on the kernel command line. Examples:
+    rd_CCW=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo
+    rd_CCW=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar
 .SH DHCP
 .TP
 .B root=dhcp
@@ -244,7 +248,7 @@ Set the NFSv4 domain name. Will overwrite the settings in /etc/idmap.conf.
 
 .SH iSCSI
 .TP
-.B root=iscsi:[username:password[reverse:password]@][<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname>
+.B root=iscsi:[username:password[:reverse:password]@][<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname>
 protocol defaults to "6", LUN defaults to "0".
 
 If the "servername" field is provided by BOOTP or DHCP, then that
@@ -261,10 +265,15 @@ http://tools.ietf.org/html/rfc4173
 e.g. root=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0
 .TP
 .B root=??? netroot=iscsi:[username:password[:reverse:password]@][<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname> ...
+.ad l
 multiple netroot options allow setting up multiple iscsi disks
 e.g. 
-   root=UUID=12424547 netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0 netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1
-.B not yet implemented
+   root=UUID=12424547
+   netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0
+   netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1
+
+.B not yet implemented!
+.ad
 .TP
 .B root=??? iscsi_initiator= iscsi_target_name= iscsi_target_ip= iscsi_target_port= iscsi_target_group= iscsi_username=  iscsi_password= iscsi_in_username= iscsi_in_password=
 .TP
@@ -284,13 +293,11 @@ the MAC-address must be lowercase!
 mount nbd share from <server>
 .TP
 .B root=dhcp 
-   with dhcp root-path=nbd:<server>:<port>[:<fstype>][:<mountopts>]
+with dhcp root-path=nbd:<server>:<port>[:<fstype>][:<mountopts>]
 root=dhcp alone directs initrd to look at the DHCP root-path where NBD options can be specified.
 This syntax is only usable in cases where you are directly mounting the volume as the rootfs.
 
 .SH Network
-.TP bootdev=<interface>
-.B specify the network interface to boot from
 .TP
 .B ip={dhcp|on|any}
 get ip from dhcp server from all interfaces. If root=dhcp, loop sequentially through all interfaces (eth0, eth1, ...) and use the first with a valid DHCP root-path.
@@ -298,7 +305,9 @@ get ip from dhcp server from all interfaces. If root=dhcp, loop sequentially thr
 .B ip=<interface>:{dhcp|on|any}
 get ip from dhcp server on a specific interface
 .TP
-.B ip=<client-IP-number>:[<server-id>]:<gateway-IP-number>:<netmask>:<client-hostname>:<interface>:{none|off}
+.ad l
+.B ip=<client-IP>:[<server-id>]:<gateway-IP>:<netmask>:<client\%hostname>:<interface>:{none|off}
+.ad
 explicit network configuration
 .TP
 .B ifname=<interface>:<MAC>
@@ -306,6 +315,9 @@ Assign network device name <interface> (ie eth0) to the NIC with MAC <MAC>.
 Note letters in the MAC-address must be lowercase!
 Note that if you use this option you \fBmust\fR specify an ifname= argument
 for all interfaces used in ip= or fcoe= arguments
+.TP
+.B bootdev=<interface>
+specify network interface to use routing and netroot information from. Required if multiple ip= lines are used.
 
 .SH Plymouth Boot Splash
 .TP
@@ -331,7 +343,7 @@ set -x for the dracut shell and logs to dmesg, console and /init.log
 .B rdbreak
 drop to a shell at the end
 .TP
-.B rdbreak={cmdline|pre-udev|pre-trigger|initqueue|pre-mount|mount|pre-pivot}
+.B rdbreak={cmdline | pre-udev | pre-trigger | initqueue | pre-mount | mount | pre-pivot}
 drop to a shell on defined breakpoint
 .TP
 .B rdudevinfo
-- 
1.6.5.3

Re: [PATCH 0/6] Various cleanups

[Harald Hoyer]

On 11/27/2009 11:57 AM, Philippe Seewer wrote:
> While debianizing dracut, debians package checker (lintian) came up with
> a few errors and warnings. Since they're not debian specific at all it
> makes sense to fix them.
>
> Philippe Seewer (6):
>    initqueue: Remove trailing ;
>    syslog-genrules.sh: Shebang should be /bin/sh not /bin/dash
>    Module scripts should be executable
>    All module scripts should have a shebang
>    loginit: Fix shebang
>    Fix manpage display errors
>
>   dracut.8                                         |   38 ++++++++++++++-------
>   modules.d/90crypt/crypt-cleanup.sh               |    1 +
>   modules.d/90crypt/parse-crypt.sh                 |    1 +
>   modules.d/90dmsquash-live/parse-dmsquash-live.sh |    1 +
>   modules.d/90lvm/lvm-cleanup.sh                   |    1 +
>   modules.d/90mdraid/mdraid-cleanup.sh             |    1 +
>   modules.d/95dasd/parse-dasd.sh                   |    1 +
>   modules.d/95dasd_mod/parse-dasd-mod.sh           |    1 +
>   modules.d/95iscsi/mount-lun.sh                   |    1 +
>   modules.d/95zfcp/parse-zfcp.sh                   |    2 +-
>   modules.d/95znet/parse-ccw.sh                    |    1 +
>   modules.d/98syslog/syslog-genrules.sh            |    2 +-
>   modules.d/99base/initqueue                       |    1 -
>   modules.d/99base/loginit                         |    2 +-
>   14 files changed, 37 insertions(+), 17 deletions(-)
>   mode change 100644 =>  100755 modules.d/40network/ifname-genrules.sh
>   mode change 100644 =>  100755 modules.d/40network/parse-bridge.sh
>   mode change 100644 =>  100755 modules.d/40network/parse-ifname.sh
>
> --
> To unsubscribe from this list: send the line "unsubscribe initramfs" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

pushed