rc-scripts-svn.patch

   1 --- lib/functions       2011-12-14 13:23:27.000000000 +0200
   2 +++ lib/functions       2011-12-14 19:16:08.333233967 +0200
   3 @@ -643,7 +643,7 @@
   4                 nice=${nice:-0}
   5
   6                 # make nice level absolute, not to be dependant of nice level of shell where service started
   7 -               nice=$((nice-$(nice)))
   8 +               nice=$(($nice - $(nice)))
   9
  10                 if [ "$closefds" = 1 ]; then
  11                         exec 1>&-
  12 Index: rc.d/rc.sysinit
  13 ===================================================================
  14 --- rc.d/rc.sysinit     (wersja 12454)
  15 +++ rc.d/rc.sysinit     (kopia robocza)
  16 @@ -617,23 +617,26 @@
  17                 fi
  18                 if [ "$lvmversion" = "1" ] ; then
  19                         modprobe -s lvm-mod >/dev/null 2>&1
  20 +                       lvmignorelocking=""
  21                         lvmsysinit=""
  22                 elif [ "$lvmversion" = "2" ] ; then
  23                         modprobe -s dm-mod >/dev/null 2>&1
  24 +                       lvmignorelocking="--ignorelockingfailure"
  25                         lvmsysinit="--sysinit"
  26                 else
  27                         modprobe -s lvm-mod >/dev/null 2>&1
  28                         # device mapper (2.5+ and patched 2.4)
  29                         modprobe -s dm-mod >/dev/null 2>&1
  30 +                       lvmignorelocking=""
  31                         lvmsysinit=""
  32                 fi
  33
  34 -               run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmsysinit
  35 +               run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelocking
  36                 run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmsysinit
  37                 if [ "$lvmversion" = "2" ]; then
  38 -                       /sbin/vgmknodes $lvmsysinit
  39 +                       /sbin/vgmknodes $lvmignorelocking
  40                         # display VG statistics
  41 -                       /sbin/vgdisplay -s $lvmsysinit
  42 +                       /sbin/vgdisplay -s $lvmignorelocking
  43                 fi
  44         fi
  45
  46 @@ -732,7 +735,7 @@
  47                         # LVM on RAID (keep in sync with LVM setting few lines above)
  48                         if [ "$golvm" -eq "1" ]; then
  49                                 if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
  50 -                                       run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmsysinit
  51 +                                       run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelocking
  52                                         run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
  53                                         [ "$lvmversion" = "2" ] && /sbin/vgmknodes
  54                                 fi