Wed Jun 6 22:19:01 UTC 201820180606221901

a/bash-4.4.023-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20180604_1fa9ce3-noarch-1.txz:  Upgraded.
a/kernel-generic-4.14.48-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.48-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.14.48-x86_64-1.txz:  Upgraded.
ap/cups-2.2.8-x86_64-1.txz:  Upgraded.
ap/ghostscript-fonts-std-8.11-noarch-3.txz:  Rebuilt.
  Rebuilt this and many other font packages or packages with build scripts
  that call mkfontdir or mkfontscale to suppress any error messages caused
  by collisions if another package installation is writing files to the
  same font directories when those utilities are run. In that case, the
  other package will also be running mkfontdir/mkfontscale after the files
  are installed, so any issues will be cleaned up then. Last one out turn
  off the lights, so to speak.
ap/sqlite-3.24.0-x86_64-1.txz:  Upgraded.
ap/terminus-font-4.40-noarch-3.txz:  Rebuilt.
d/kernel-headers-4.14.48-x86-1.txz:  Upgraded.
d/rust-1.26.2-x86_64-1.txz:  Upgraded.
k/kernel-source-4.14.48-noarch-1.txz:  Upgraded.
l/elfutils-0.171-x86_64-1.txz:  Upgraded.
l/harfbuzz-1.7.7-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.37.3-x86_64-1.txz:  Upgraded.
l/readline-7.0.005-x86_64-1.txz:  Upgraded.
x/dejavu-fonts-ttf-2.37-noarch-4.txz:  Rebuilt.
x/font-adobe-100dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-adobe-75dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-adobe-utopia-100dpi-1.0.4-noarch-3.txz:  Rebuilt.
x/font-adobe-utopia-75dpi-1.0.4-noarch-3.txz:  Rebuilt.
x/font-adobe-utopia-type1-1.0.4-noarch-3.txz:  Rebuilt.
x/font-arabic-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-100dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-75dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-lucidatypewriter-100dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-lucidatypewriter-75dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-ttf-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-type1-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bitstream-100dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bitstream-75dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bitstream-speedo-1.0.2-noarch-3.txz:  Rebuilt.
x/font-bitstream-type1-1.0.3-noarch-3.txz:  Rebuilt.
x/font-cronyx-cyrillic-1.0.3-noarch-3.txz:  Rebuilt.
x/font-cursor-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-daewoo-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-dec-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-ibm-type1-1.0.3-noarch-3.txz:  Rebuilt.
x/font-isas-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-jis-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-micro-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-misc-cyrillic-1.0.3-noarch-3.txz:  Rebuilt.
x/font-misc-ethiopic-1.0.3-noarch-3.txz:  Rebuilt.
x/font-misc-meltho-1.0.3-noarch-3.txz:  Rebuilt.
x/font-misc-misc-1.1.2-noarch-3.txz:  Rebuilt.
x/font-mutt-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-schumacher-misc-1.1.2-noarch-3.txz:  Rebuilt.
x/font-screen-cyrillic-1.0.4-noarch-3.txz:  Rebuilt.
x/font-sony-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-sun-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-winitzki-cyrillic-1.0.3-noarch-3.txz:  Rebuilt.
x/font-xfree86-type1-1.0.4-noarch-3.txz:  Rebuilt.
x/liberation-fonts-ttf-2.00.1-noarch-3.txz:  Rebuilt.
x/libinput-1.11.0-x86_64-1.txz:  Upgraded.
x/sazanami-fonts-ttf-20040629-noarch-3.txz:  Rebuilt.
x/sinhala_lklug-font-ttf-20060929-noarch-3.txz:  Rebuilt.
x/tibmachuni-font-ttf-1.901b-noarch-3.txz:  Rebuilt.
x/ttf-indic-fonts-0.5.14-noarch-3.txz:  Rebuilt.
x/ttf-tlwg-0.6.4-noarch-3.txz:  Rebuilt.
x/urw-core35-fonts-otf-20170801_91edd6e_git-noarch-2.txz:  Rebuilt.
x/wqy-zenhei-font-ttf-0.8.38_1-noarch-6.txz:  Rebuilt.
xap/mozilla-firefox-60.0.2-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/security/known-vulnerabilities/firefox.html
  (* Security fix *)
xap/x3270-3.3.12ga7-x86_64-5.txz:  Rebuilt.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

7 files changed, 1230 insertions, 0 deletions

diff --git a/source/installer/sources/initrd/sbin/brc b/source/installer/sources/initrd/sbin/brc
new file mode 100755
index 000000000..683f471bf
--- /dev/null
+++ b/source/installer/sources/initrd/sbin/brc
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# /sbin/brc (whatever that means ;)
+# This script gets run just before the system is down.
+#
+cat << EOF
+
+
+The system is rebooting NOW!
+
+Syncing disks...
+EOF
+/bin/sync
+echo
+echo "Unmounting file systems... "
+/bin/umount -a 1> /dev/null 2> /dev/null
+echo
+sleep 2
+/sbin/reboot -f
diff --git a/source/installer/sources/initrd/sbin/cfdisk b/source/installer/sources/initrd/sbin/cfdisk
new file mode 100755
index 000000000..582a1414b
--- /dev/null
+++ b/source/installer/sources/initrd/sbin/cfdisk
@@ -0,0 +1,5 @@
+#!/bin/sh
+cfdisk.bin $*
+if [ -x /dev/makedevs.sh ]; then
+  /dev/makedevs.sh
+fi
diff --git a/source/installer/sources/initrd/sbin/fakedate b/source/installer/sources/initrd/sbin/fakedate
new file mode 100755
index 000000000..e89d438dc
--- /dev/null
+++ b/source/installer/sources/initrd/sbin/fakedate
@@ -0,0 +1,4 @@
+if [ -r /.today ]; then
+  date -s yesterday 1> /dev/null 2> /dev/null
+  rm -f /.today
+fi
diff --git a/source/installer/sources/initrd/sbin/fdisk b/source/installer/sources/initrd/sbin/fdisk
new file mode 100755
index 000000000..7b0c2693f
--- /dev/null
+++ b/source/installer/sources/initrd/sbin/fdisk
@@ -0,0 +1,5 @@
+#!/bin/sh
+fdisk.bin $*
+if [ -x /dev/makedevs.sh ]; then
+  /dev/makedevs.sh
+fi
diff --git a/source/installer/sources/initrd/sbin/fixdate b/source/installer/sources/initrd/sbin/fixdate
new file mode 100755
index 000000000..096349909
--- /dev/null
+++ b/source/installer/sources/initrd/sbin/fixdate
@@ -0,0 +1,4 @@
+if [ ! -r /.today ]; then
+  date -s tomorrow 1> /dev/null 2> /dev/null
+  touch /.today
+fi
diff --git a/source/installer/sources/initrd/sbin/probe b/source/installer/sources/initrd/sbin/probe
new file mode 100755
index 000000000..eca6db9dd
--- /dev/null
+++ b/source/installer/sources/initrd/sbin/probe
@@ -0,0 +1,438 @@
+#!/bin/sh
+# This is 'probe', a wrapper for using fdisk to gather drive info for
+# the Slackware setup scripts.  I hate to bounce this much garbage through
+# a tmpdir, but it looks like large variables can make ash crash...
+
+# Many thanks to Vincent Rivellino for contributing the patches to support
+# Mylex and Compaq RAID controllers.
+
+# Regularize output that will be parsed:
+unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
+  LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \
+  LC_IDENTIFICATION LC_ALL
+LANG=C
+export LANG
+
+TMP=/var/log/setup/tmp
+
+# Use cached results if they exist and /proc/partitions has not changed:
+if [ -r $TMP/SeTpartition.md5 -a -r $TMP/SeTfdisk ]; then
+  if [ "$(cat $TMP/SeTpartition.md5)" = "$(md5sum /proc/partitions)" ]; then
+    cat $TMP/SeTfdisk
+    exit 0
+  fi
+fi
+
+# First run, or /proc/partitions has changed.
+# Make a checksum for later comparison:
+md5sum /proc/partitions > $TMP/SeTpartition.md5
+
+# Wipe any previously existing results:
+rm -f $TMP/SeTfdisk
+
+# listide major minor hd1 hd2 (2 base devs for major)
+list_ide() {
+  if [ "$2" = "0" ]; then
+    fdisk -l /dev/$3 >> $TMP/SeTfdisk
+  elif [ "$2" = "64" ]; then
+    fdisk -l /dev/$4 >> $TMP/SeTfdisk
+  fi
+}
+
+list_scsi() {
+  # find drive # 0 - 15
+  DRV=`expr $1 / 16`
+  NUM=`expr $1 % 16`
+  if [ ! "$NUM" = "0" ]; then
+    return
+  fi
+  if [ "$DRV" = "0" ]; then
+    fdisk -l /dev/sda >> $TMP/SeTfdisk
+  elif [ "$DRV" = "1" ]; then
+    fdisk -l /dev/sdb >> $TMP/SeTfdisk
+  elif [ "$DRV" = "2" ]; then
+    fdisk -l /dev/sdc >> $TMP/SeTfdisk
+  elif [ "$DRV" = "3" ]; then
+    fdisk -l /dev/sdd >> $TMP/SeTfdisk
+  elif [ "$DRV" = "4" ]; then
+    fdisk -l /dev/sde >> $TMP/SeTfdisk
+  elif [ "$DRV" = "5" ]; then
+    fdisk -l /dev/sdf >> $TMP/SeTfdisk
+  elif [ "$DRV" = "6" ]; then
+    fdisk -l /dev/sdg >> $TMP/SeTfdisk
+  elif [ "$DRV" = "7" ]; then
+    fdisk -l /dev/sdh >> $TMP/SeTfdisk
+  elif [ "$DRV" = "8" ]; then
+    fdisk -l /dev/sdi >> $TMP/SeTfdisk
+  elif [ "$DRV" = "9" ]; then
+    fdisk -l /dev/sdj >> $TMP/SeTfdisk
+  elif [ "$DRV" = "10" ]; then
+    fdisk -l /dev/sdk >> $TMP/SeTfdisk
+  elif [ "$DRV" = "11" ]; then
+    fdisk -l /dev/sdl >> $TMP/SeTfdisk
+  elif [ "$DRV" = "12" ]; then
+    fdisk -l /dev/sdm >> $TMP/SeTfdisk
+  elif [ "$DRV" = "13" ]; then
+    fdisk -l /dev/sdn >> $TMP/SeTfdisk
+  elif [ "$DRV" = "14" ]; then
+    fdisk -l /dev/sdo >> $TMP/SeTfdisk
+  elif [ "$DRV" = "15" ]; then
+    fdisk -l /dev/sdp >> $TMP/SeTfdisk
+  fi
+}
+
+# List Mylex RAID device
+list_rd() {
+  # find drive
+  DRV=`expr $2 / 8`
+  NUM=`expr $2 % 8`
+  if [ ! "$NUM" = "0" ]; then
+    return
+  fi
+  fdisk -l /dev/rd/c$1d$DRV >> $TMP/SeTfdisk
+  #output_gpt_partitions /dev/rd/c$1d$DRV >> $TMP/SeTfdisk
+}
+
+# List Cpq SMART/2 RAID device
+list_ida() {
+  # find drive
+  DRV=`expr $2 / 16`
+  NUM=`expr $2 % 16`
+  if [ ! "$NUM" = "0" ]; then
+    return
+  fi
+  fdisk -l /dev/ida/c$1d$DRV >> $TMP/SeTfdisk
+  #output_gpt_partitions /dev/ida/c$1d$DRV >> $TMP/SeTfdisk
+}
+
+list_cciss() {
+  # find drive
+  DRV=`expr $2 / 16`
+  NUM=`expr $2 % 16`
+  if [ ! "$NUM" = "0" ]; then
+    return
+  fi
+  fdisk -l /dev/cciss/c$1d$DRV >> $TMP/SeTfdisk
+  #output_gpt_partitions /dev/cciss/c$1d$DRV >> $TMP/SeTfdisk
+}
+
+list_ataraid() {
+  # find drive
+  DRV=`expr $2 / 16`
+  NUM=`expr $2 % 16`
+  if [ "$NUM" = "0" ]; then
+     fdisk -l /dev/ataraid/d$DRV >> $TMP/SeTfdisk
+     #output_gpt_partitions /dev/ataraid/d$DRV >> $TMP/SeTfdisk
+  else
+     return
+  fi
+}
+
+list_amiraid() {
+  # find drive
+  DRV=`expr $2 / 16`
+  NUM=`expr $2 % 16`
+  if [ "$NUM" = "0" ]; then
+     fdisk -l /dev/amiraid/ar$DRV >> $TMP/SeTfdisk
+     #output_gpt_partitions /dev/amiraid/ar$DRV >> $TMP/SeTfdisk
+  else
+     return
+  fi
+}
+
+list_mmc() {
+  # find drive
+  DRV=`expr $2 / 8`
+  NUM=`expr $2 % 8`
+  if [ "$NUM" = "0" ]; then
+     fdisk -l /dev/mmcblk$DRV >> $TMP/SeTfdisk
+     #output_gpt_partitions /dev/mmcblk$DRV >> $TMP/SeTfdisk
+  else
+     return
+  fi
+}
+
+list_nvme() {
+  fdisk -l | grep $1 >> $TMP/SeTfdisk 2> /dev/null
+}
+
+is_swap() {
+  HEADER=$(dd if="$1" bs=1 skip=4086 count=10 2>/dev/null | strings)
+  if [ "$HEADER" = "SWAPSPACE2" -o "$HEADER" = "SWAP_SPACE" ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+list_md() {
+  if ( is_swap "/dev/$2" ); then TYPE="Linux swap"; else TYPE="Linux"; fi
+  echo "/dev/$2  1 2 $1 kk $TYPE" >> $TMP/SeTfdisk
+}
+
+list_lvm() {
+  lvscan 2>/dev/null | grep "ACTIVE" | while read line ; do
+    SMASHED_LINE=$line
+    if [ "$SMASHED_LINE" = "" ]; then
+      break;
+    fi
+    DEV=`echo $SMASHED_LINE | cut -f2 -d"'"`
+    SIZE=`lvdisplay $DEV -C --units k --noheadings --separator : | cut -f4 -d':'  | sed -e 's/^\([0-9]*\)[^0-9].*/\1/'`
+    TYPE="Linux"
+    if ( is_swap "$DEV" ); then TYPE="Linux swap"; fi
+    echo "$DEV  0  0  $SIZE  lv  $TYPE" >> $TMP/SeTfdisk
+  done
+}
+
+# List any volumes created by cryptsetup
+list_crypt() {
+  for i in $(ls /dev/mapper/); do
+    if cryptsetup status $i 2>/dev/null | grep "is active" 1>/dev/null ; then
+      DEV=$(cryptsetup status $i 2>/dev/null | grep "is active" | cut -f1 -d' ')
+      SIZE=$(fdisk -s $(cryptsetup status $i 2>/dev/null | grep "device:" | cut -f2 -d: | tr -d ' '))
+      echo "$DEV  0  0  $SIZE  lc  Linux" >> $TMP/SeTfdisk
+    fi
+  done
+}
+
+# List virtual partitions
+list_virt() {
+  fdisk -l /dev/$1 >> $TMP/SeTfdisk
+  #output_gpt_partitions /dev/$1 >> $TMP/SeTfdisk
+}
+
+output_gpt_partitions() {
+# First, make sure the device is GPT:
+if fdisk -l $1 2> /dev/null | grep -wq -e "GPT" -e "Disklabel type: gpt" ; then 
+  unset output
+  # In the case of some RAID device like Mylex we will need to delimit the
+  # partition number.  We will set a partition delimiter variable P set
+  # either to an empty string (default) or the needed delimiter.
+  TESTRAID="$(echo $1 | cut -f 2 -d /)"
+  case "$TESTRAID" in
+  'amiraid' )
+    P="p"
+    ;;
+  'ataraid' )
+    P="p"
+    ;;
+  'cciss' )
+    P="p"
+    ;;
+  'ida' )
+    P="p"
+    ;;
+  'rd' )
+    P="p"
+    ;;
+  *)
+    P=""
+    ;;
+  esac
+  gdisk -l $1 | tr -d '*' | while read parse ; do
+    if [ ! -z $output ]; then
+      line=$parse
+      if [ ! "$(echo $line | cut -b1)" = "" ]; then
+        gptpartition=${1}${P}$(echo $line | cut -f 1 -d ' ')
+        gpttype="$(echo $line | cut -f 6 -d ' ')"
+        if [ "$gpttype" = "8200" ]; then
+          fdisktype="Linux swap"
+        elif [ "$gpttype" = "0700" ]; then
+          if dd if=$gptpartition bs=1K count=1 2> /dev/null | grep -wq NTFS ; then
+            fdisktype="HPFS/NTFS"
+          elif dd if=$gptpartition bs=1K count=1 2> /dev/null | grep -wq EXFAT ; then
+            fdisktype="exFAT"
+          else
+            fdisktype="W95 FAT32"
+          fi
+        elif [ "$gpttype" = "AF00" ]; then
+          fdisktype="HFS+"
+        elif [ "$gpttype" = "EF00" ]; then
+          fdisktype="EFI System Partition"
+        elif [ "$gpttype" = "8300" ]; then
+          fdisktype=Linux
+        else
+          fdisktype="Unknown hex code $gpttype"
+        fi
+        sectorsize="$(gdisk -l $1 | tr -d '*' | grep "Logical sector size" | cut -f 2 -d : | cut -f 2 -d ' ')"
+        gptstart="$(expr $(echo $line | cut -f 2 -d ' ') \* $sectorsize / 1024)"
+        gptend="$(expr $(echo $line | cut -f 3 -d ' ') \* $sectorsize / 1024)"
+        gptsize="$(expr $gptend - $gptstart)"
+        echo $gptpartition $gptstart $gptend $gptsize $gpttype $fdisktype
+      fi
+    fi
+    if echo $parse | grep -q "^Number" ; then
+      output=true
+    fi
+  done
+fi
+}
+
+list_scsi_gpt() {
+  # find drive # 0 - 15
+  DRV=`expr $1 / 16`
+  NUM=`expr $1 % 16`
+  if [ ! "$NUM" = "0" ]; then
+    return
+  fi
+  if [ "$DRV" = "0" ]; then
+    output_gpt_partitions /dev/sda
+  elif [ "$DRV" = "1" ]; then
+    output_gpt_partitions /dev/sdb
+  elif [ "$DRV" = "2" ]; then
+    output_gpt_partitions /dev/sdc
+  elif [ "$DRV" = "3" ]; then
+    output_gpt_partitions /dev/sdd
+  elif [ "$DRV" = "4" ]; then
+    output_gpt_partitions /dev/sde
+  elif [ "$DRV" = "5" ]; then
+    output_gpt_partitions /dev/sdf
+  elif [ "$DRV" = "6" ]; then
+    output_gpt_partitions /dev/sdg
+  elif [ "$DRV" = "7" ]; then
+    output_gpt_partitions /dev/sdh
+  elif [ "$DRV" = "8" ]; then
+    output_gpt_partitions /dev/sdi
+  elif [ "$DRV" = "9" ]; then
+    output_gpt_partitions /dev/sdj
+  elif [ "$DRV" = "10" ]; then
+    output_gpt_partitions /dev/sdk
+  elif [ "$DRV" = "11" ]; then
+    output_gpt_partitions /dev/sdl
+  elif [ "$DRV" = "12" ]; then
+    output_gpt_partitions /dev/sdm
+  elif [ "$DRV" = "13" ]; then
+    output_gpt_partitions /dev/sdn
+  elif [ "$DRV" = "14" ]; then
+    output_gpt_partitions /dev/sdo
+  elif [ "$DRV" = "15" ]; then
+    output_gpt_partitions /dev/sdp
+  fi
+}
+
+# List the LVM volumes:
+list_lvm
+
+# List CRYPT volumes:
+list_crypt
+
+## This is obsolete, since fdisk handles GPT now.
+## List GPT partitions:
+#cat /proc/partitions | while read line ; do
+#  SMASHED_LINE=$line
+#  MAJOR=`echo $SMASHED_LINE | cut -f 1 -d ' '`
+#  MINOR=`echo $SMASHED_LINE | cut -f 2 -d ' '`
+#  if [ "$MAJOR" = "8" ]; then
+#    list_scsi_gpt $MINOR
+#  fi
+#done
+
+# Other partitions:
+if cat /proc/partitions | grep -E '/|[0-9]' 1>/dev/null 2>/dev/null ; then # new
+  cat /proc/partitions | grep -E '/|[0-9]' | while read line ; do
+    SMASHED_LINE=$line
+    MAJOR=`echo $SMASHED_LINE | cut -f 1 -d ' '`
+    MINOR=`echo $SMASHED_LINE | cut -f 2 -d ' '`
+    DEVNAME=`echo $SMASHED_LINE | cut -f 4 -d ' '`
+    if [ "$MAJOR" = "3" ]; then
+      list_ide $MAJOR $MINOR hda hdb
+    elif [ "$MAJOR" = "8" ]; then
+      list_scsi $MINOR
+    elif [ "$MAJOR" = "9" ]; then
+      list_md `echo $SMASHED_LINE | cut -f 3 -d ' ' | tr -d '/'` \
+              `echo $SMASHED_LINE | cut -f 4 -d ' '`
+    elif [ "$MAJOR" = "22" ]; then
+      list_ide $MAJOR $MINOR hdc hdd
+    elif [ "$MAJOR" = "33" ]; then
+      list_ide $MAJOR $MINOR hde hdf
+    elif [ "$MAJOR" = "34" ]; then
+      list_ide $MAJOR $MINOR hdg hdh
+    elif [ "$MAJOR" = "48" ]; then
+      list_rd 0 $MINOR
+    elif [ "$MAJOR" = "49" ]; then
+      list_rd 1 $MINOR
+    elif [ "$MAJOR" = "50" ]; then
+      list_rd 2 $MINOR
+    elif [ "$MAJOR" = "51" ]; then
+      list_rd 3 $MINOR
+    elif [ "$MAJOR" = "52" ]; then
+      list_rd 4 $MINOR
+    elif [ "$MAJOR" = "53" ]; then
+      list_rd 5 $MINOR
+    elif [ "$MAJOR" = "54" ]; then
+      list_rd 6 $MINOR
+    elif [ "$MAJOR" = "55" ]; then
+      list_rd 7 $MINOR
+    elif [ "$MAJOR" = "56" ]; then
+      list_ide $MAJOR $MINOR hdi hdj
+    elif [ "$MAJOR" = "57" ]; then
+      list_ide $MAJOR $MINOR hdk hdl
+    elif [ "$MAJOR" = "72" ]; then
+      list_ida 0 $MINOR
+    elif [ "$MAJOR" = "73" ]; then
+      list_ida 1 $MINOR
+    elif [ "$MAJOR" = "74" ]; then
+      list_ida 2 $MINOR
+    elif [ "$MAJOR" = "75" ]; then
+      list_ida 3 $MINOR
+    elif [ "$MAJOR" = "76" ]; then
+      list_ida 4 $MINOR
+    elif [ "$MAJOR" = "77" ]; then
+      list_ida 5 $MINOR
+    elif [ "$MAJOR" = "78" ]; then
+      list_ida 6 $MINOR
+    elif [ "$MAJOR" = "79" ]; then
+      list_ida 7 $MINOR
+    elif [ "$MAJOR" = "80" ]; then
+      list_ide $MAJOR $MINOR hdm hdn
+    elif [ "$MAJOR" = "89" ]; then
+      list_ide $MAJOR $MINOR hdo hdp
+    elif [ "$MAJOR" = "90" ]; then
+      list_ide $MAJOR $MINOR hdq hdr
+    elif [ "$MAJOR" = "91" ]; then
+      list_ide $MAJOR $MINOR hds hdt
+    elif [ "$MAJOR" = "101" ]; then
+      list_amiraid $MAJOR $MINOR
+    elif [ "$MAJOR" = "104" \
+      -o "$MAJOR" = "105" \
+      -o "$MAJOR" = "106" \
+      -o "$MAJOR" = "107" \
+      -o "$MAJOR" = "108" \
+      -o "$MAJOR" = "109" \
+      -o "$MAJOR" = "110" \
+      -o "$MAJOR" = "111" ]; then
+      list_cciss $(( $MAJOR - 104 )) $MINOR
+    elif [ "$MAJOR" = "114" ]; then
+      list_ataraid $MAJOR $MINOR
+    elif [ "$MAJOR" = "179" ]; then
+      list_mmc $MAJOR $MINOR
+    elif [ "$MAJOR" = "259" ]; then
+      if echo $line | grep -q p; then
+        list_nvme $DEVNAME
+      fi
+    elif [ $(expr $DEVNAME : 'x\?vd[^0-9]*$') -ne 0 ]; then
+      # The virtio devices have no set major dev number, so we have to search
+      # by name.  Matches full drive names for KVM/lguest (vda) and Xen (xvda).
+      list_virt $DEVNAME
+    fi
+  done
+else # old format and no RAID:
+  if cat /proc/partitions | grep md 1> /dev/null 2> /dev/null ; then
+    cat /proc/partitions | grep md | while read line ; do
+      SMASHED_LINE=$line
+      MAJOR=`echo $SMASHED_LINE | cut -f 1 -d ' '`
+      if [ "$MAJOR" = "9" ]; then
+        list_md `echo $SMASHED_LINE | cut -f 3 -d ' ' | tr -d '/'` \
+                `echo $SMASHED_LINE | cut -f 4 -d ' '`
+      fi
+    done
+  fi
+  fdisk -l 2> /dev/null >> $TMP/SeTfdisk
+fi
+
+# Change the names to be the same as what the old fdisk used:
+sed -i -e "s/Linux filesystem/Linux/g" $TMP/SeTfdisk
+sed -i -e "s/EFI System/EFI System Partition/g" $TMP/SeTfdisk
+sed -i -e "s,EFI (FAT-12/16/32),EFI System Partition,g" $TMP/SeTfdisk
+
+cat $TMP/SeTfdisk
diff --git a/source/installer/sources/initrd/sbin/rescan-scsi-bus b/source/installer/sources/initrd/sbin/rescan-scsi-bus
new file mode 100755
index 000000000..0bfca50d1
--- /dev/null
+++ b/source/installer/sources/initrd/sbin/rescan-scsi-bus
@@ -0,0 +1,755 @@
+#!/bin/bash
+# Skript to rescan SCSI bus, using the 
+# scsi add-single-device mechanism
+# (c) 1998--2010 Kurt Garloff <kurt@garloff.de>, GNU GPL v2 or v3
+# (c) 2006--2008 Hannes Reinecke, GNU GPL v2 or later
+# $Id: rescan-scsi-bus.sh,v 1.56 2012/01/14 22:23:53 garloff Exp $
+
+SCAN_WILD_CARD=4294967295
+
+setcolor ()
+{
+  red="\e[0;31m"
+  green="\e[0;32m"
+  yellow="\e[0;33m"
+  bold="\e[0;1m"
+  norm="\e[0;0m"
+}
+
+unsetcolor () 
+{
+  red=""; green=""
+  yellow=""; norm=""
+}
+
+# Output some text and return cursor to previous position
+# (only works for simple strings)
+# Stores length of string in LN and returns it
+print_and_scroll_back ()
+{
+  STRG="$1"
+  LN=${#STRG}
+  BK=""
+  declare -i cntr=0
+  while test $cntr -lt $LN; do BK="$BK\e[D"; let cntr+=1; done
+  echo -en "$STRG$BK"
+  return $LN
+}
+
+# Overwrite a text of length $1 (fallback to $LN) with whitespace
+white_out ()
+{
+  BK=""; WH=""
+  if test -n "$1"; then LN=$1; fi
+  declare -i cntr=0
+  while test $cntr -lt $LN; do BK="$BK\e[D"; WH="$WH "; let cntr+=1; done
+  echo -en "$WH$BK"
+}
+
+# Return hosts. sysfs must be mounted
+findhosts_26 ()
+{
+  hosts=`find /sys/class/scsi_host/host* -maxdepth 4 -type d -o -type l 2> /dev/null | awk -F'/' '{print $5}' | sed -e 's~host~~' | sort -nu` 
+  scsi_host_data=`echo "$hosts" | sed -e 's~^~/sys/class/scsi_host/host~'` 
+  for hostdir in $scsi_host_data; do 
+    hostno=${hostdir#/sys/class/scsi_host/host}
+    if [ -f $hostdir/isp_name ] ; then
+      hostname="qla2xxx"
+    elif [ -f $hostdir/lpfc_drvr_version ] ; then
+      hostname="lpfc"
+    else
+      hostname=`cat $hostdir/proc_name`
+    fi
+    #hosts="$hosts $hostno"
+    echo "Host adapter $hostno ($hostname) found."
+  done  
+  if [ -z "$hosts" ] ; then
+    echo "No SCSI host adapters found in sysfs"
+    exit 1;
+  fi
+  # Not necessary just use double quotes around variable to preserve new lines
+  #hosts=`echo $hosts | tr ' ' '\n'`
+}
+
+# Return hosts. /proc/scsi/HOSTADAPTER/? must exist
+findhosts ()
+{
+  hosts=
+  for driverdir in /proc/scsi/*; do
+    driver=${driverdir#/proc/scsi/}
+    if test $driver = scsi -o $driver = sg -o $driver = dummy -o $driver = device_info; then continue; fi
+    for hostdir in $driverdir/*; do
+      name=${hostdir#/proc/scsi/*/}
+      if test $name = add_map -o $name = map -o $name = mod_parm; then continue; fi
+      num=$name
+      driverinfo=$driver
+      if test -r $hostdir/status; then
+	num=$(printf '%d\n' `sed -n 's/SCSI host number://p' $hostdir/status`)
+	driverinfo="$driver:$name"
+      fi
+      hosts="$hosts $num"
+      echo "Host adapter $num ($driverinfo) found."
+    done
+  done
+}
+
+printtype ()
+{
+  local type=$1
+
+  case "$type" in
+    0) echo "Direct-Access    " ;;
+    1) echo "Sequential-Access" ;;
+    2) echo "Printer          " ;;
+    3) echo "Processor        " ;;
+    4) echo "WORM             " ;;
+    5) echo "CD-ROM           " ;;
+    6) echo "Scanner          " ;;
+    7) echo "Optical Device   " ;;
+    8) echo "Medium Changer   " ;;
+    9) echo "Communications   " ;;
+    10) echo "Unknown          " ;;
+    11) echo "Unknown          " ;;
+    12) echo "RAID             " ;;
+    13) echo "Enclosure        " ;;
+    14) echo "Direct-Access-RBC" ;;
+    *) echo "Unknown          " ;;
+  esac
+}
+
+print02i()
+{
+    if [ "$1" = "*" ] ; then 
+        echo "00"
+    else
+        printf "%02i" "$1"
+    fi
+}
+
+# Get /proc/scsi/scsi info for device $host:$channel:$id:$lun
+# Optional parameter: Number of lines after first (default = 2), 
+# result in SCSISTR, return code 1 means empty.
+procscsiscsi ()
+{  
+  if test -z "$1"; then LN=2; else LN=$1; fi
+  CHANNEL=`print02i "$channel"`
+  ID=`print02i "$id"`
+  LUN=`print02i "$lun"`
+  if [ -d /sys/class/scsi_device ]; then
+    SCSIPATH="/sys/class/scsi_device/${host}:${channel}:${id}:${lun}"
+    if [ -d  "$SCSIPATH" ] ; then
+      SCSISTR="Host: scsi${host} Channel: $CHANNEL Id: $ID Lun: $LUN"
+      if [ "$LN" -gt 0 ] ; then
+	IVEND=$(cat ${SCSIPATH}/device/vendor)
+	IPROD=$(cat ${SCSIPATH}/device/model)
+	IPREV=$(cat ${SCSIPATH}/device/rev)
+	SCSIDEV=$(printf '  Vendor: %-08s Model: %-16s Rev: %-4s' "$IVEND" "$IPROD" "$IPREV")
+	SCSISTR="$SCSISTR
+$SCSIDEV"
+      fi
+      if [ "$LN" -gt 1 ] ; then
+	ILVL=$(cat ${SCSIPATH}/device/scsi_level)
+	type=$(cat ${SCSIPATH}/device/type)
+	ITYPE=$(printtype $type)
+	SCSITMP=$(printf '  Type:   %-16s                ANSI SCSI revision: %02d' "$ITYPE" "$((ILVL - 1))")
+	SCSISTR="$SCSISTR
+$SCSITMP"
+      fi
+    else
+      return 1
+    fi
+  else
+    grepstr="scsi$host Channel: $CHANNEL Id: $ID Lun: $LUN"
+    SCSISTR=`cat /proc/scsi/scsi | grep -A$LN -e"$grepstr"`
+  fi
+  if test -z "$SCSISTR"; then return 1; else return 0; fi
+}
+
+# Find sg device with 2.6 sysfs support
+sgdevice26 ()
+{
+  if test -e /sys/class/scsi_device/$host\:$channel\:$id\:$lun/device/generic; then	
+    SGDEV=`readlink /sys/class/scsi_device/$host\:$channel\:$id\:$lun/device/generic`
+    SGDEV=`basename $SGDEV`
+  else
+    for SGDEV in /sys/class/scsi_generic/sg*; do
+      DEV=`readlink $SGDEV/device`
+      if test "${DEV##*/}" = "$host:$channel:$id:$lun"; then
+	SGDEV=`basename $SGDEV`; return
+      fi
+    done
+    SGDEV=""
+  fi  
+}
+
+# Find sg device with 2.4 report-devs extensions
+sgdevice24 ()
+{
+  if procscsiscsi 3; then
+    SGDEV=`echo "$SCSISTR" | grep 'Attached drivers:' | sed 's/^ *Attached drivers: \(sg[0-9]*\).*/\1/'`
+  fi
+}
+
+# Find sg device that belongs to SCSI device $host $channel $id $lun
+# and return in SGDEV
+sgdevice ()
+{
+  SGDEV=
+  if test -d /sys/class/scsi_device; then
+    sgdevice26
+  else  
+    DRV=`grep 'Attached drivers:' /proc/scsi/scsi 2>/dev/null`
+    repdevstat=$((1-$?))
+    if [ $repdevstat = 0 ]; then
+      echo "scsi report-devs 1" >/proc/scsi/scsi
+      DRV=`grep 'Attached drivers:' /proc/scsi/scsi 2>/dev/null`
+      if [ $? = 1 ]; then return; fi
+    fi
+    if ! `echo $DRV | grep 'drivers: sg' >/dev/null`; then
+      modprobe sg
+    fi
+    sgdevice24
+    if [ $repdevstat = 0 ]; then
+      echo "scsi report-devs 0" >/proc/scsi/scsi
+    fi
+  fi
+}
+
+# Test if SCSI device is still responding to commands
+testonline ()
+{
+  : testonline
+  RC=0
+  if test ! -x /usr/bin/sg_turs; then return 0; fi
+  sgdevice
+  if test -z "$SGDEV"; then return 0; fi
+  sg_turs /dev/$SGDEV >/dev/null 2>&1
+  RC=$?
+  # Handle in progress of becoming ready and unit attention -- wait at max 11s
+  declare -i ctr=0
+  if test $RC = 2 -o $RC = 6; then 
+    RMB=`sg_inq /dev/$SGDEV | grep 'RMB=' | sed 's/^.*RMB=\(.\).*$/\1/'`
+    print_and_scroll_back "$host:$channel:$id:$lun $SGDEV ($RMB) "
+  fi
+  while test $RC = 2 -o $RC = 6 && test $ctr -le 8; do
+    if test $RC = 2 -a "$RMB" != "1"; then echo -n "."; let $LN+=1; sleep 1
+    else usleep 20000; fi
+    let ctr+=1
+    sg_turs /dev/$SGDEV >/dev/null 2>&1
+    RC=$?
+  done
+  if test $ctr != 0; then white_out; fi
+  # echo -e "\e[A\e[A\e[A${yellow}Test existence of $SGDEV = $RC ${norm} \n\n\n"
+  if test $RC = 1; then return $RC; fi
+  # Reset RC (might be !=0 for passive paths)
+  RC=0
+  # OK, device online, compare INQUIRY string
+  INQ=`sg_inq $sg_len_arg /dev/$SGDEV 2>/dev/null`
+  IVEND=`echo "$INQ" | grep 'Vendor identification:' | sed 's/^[^:]*: \(.*\)$/\1/'`
+  IPROD=`echo "$INQ" | grep 'Product identification:' | sed 's/^[^:]*: \(.*\)$/\1/'`
+  IPREV=`echo "$INQ" | grep 'Product revision level:' | sed 's/^[^:]*: \(.*\)$/\1/'`
+  STR=`printf "  Vendor: %-08s Model: %-16s Rev: %-4s" "$IVEND" "$IPROD" "$IPREV"`
+  IPTYPE=`echo "$INQ" | sed -n 's/.* Device_type=\([0-9]*\) .*/\1/p'`
+  IPQUAL=`echo "$INQ" | sed -n 's/ *PQual=\([0-9]*\)  Device.*/\1/p'`
+  if [ "$IPQUAL" != 0 ] ; then
+    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}LU not available (PQual $IPQUAL)${norm}    \n\n\n"
+    return 2
+  fi
+
+  TYPE=$(printtype $IPTYPE)
+  procscsiscsi
+  TMPSTR=`echo "$SCSISTR" | grep 'Vendor:'`
+  if [ "$TMPSTR" != "$STR" ]; then
+    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${SCSISTR#* } \nto: $STR ${norm} \n\n\n"
+    return 1
+  fi
+  TMPSTR=`echo "$SCSISTR" | sed -n 's/.*Type: *\(.*\) *ANSI.*/\1/p'`
+  if [ $TMPSTR != $TYPE ] ; then
+    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR} \nto: $TYPE ${norm} \n\n\n"
+    return 1
+  fi
+  return $RC
+}
+
+# Test if SCSI device $host $channen $id $lun exists
+# Outputs description from /proc/scsi/scsi (unless arg passed)
+# Returns SCSISTR (empty if no dev)
+testexist ()
+{
+  : testexist
+  SCSISTR=
+  if procscsiscsi && test -z "$1"; then
+    echo "$SCSISTR" | head -n1
+    echo "$SCSISTR" | tail -n2 | pr -o4 -l1
+  fi
+}
+
+# Returns the list of existing channels per host
+chanlist ()
+{
+  local hcil
+  local cil
+  local chan
+  local tmpchan
+
+  for dev in /sys/class/scsi_device/${host}:* ; do
+    [ -d $dev ] || continue;
+    hcil=${dev##*/}
+    cil=${hcil#*:}
+    chan=${cil%%:*}
+    for tmpchan in $channelsearch ; do
+      if test "$chan" -eq $tmpchan ; then
+	chan=
+      fi
+    done
+    if test -n "$chan" ; then
+      channelsearch="$channelsearch $chan"
+    fi
+  done
+  if test -z "$channelsearch"; then channelsearch="0"; fi
+}
+
+# Returns the list of existing targets per host
+idlist ()
+{
+  local hcil
+  local cil
+  local il
+  local target
+  local tmpid
+
+  for dev in /sys/class/scsi_device/${host}:${channel}:* ; do
+    [ -d $dev ] || continue;
+    hcil=${dev##*/}
+    cil=${hcil#*:}
+    il=${cil#*:}
+    target=${il%%:*}
+    for tmpid in $idsearch ; do
+      if test "$target" -eq $tmpid ; then
+	target=
+	break
+      fi
+    done
+    if test -n "$target" ; then
+      idsearch="$idsearch $target"
+    fi
+  done
+}
+
+# Returns the list of existing LUNs from device $host $channel $id $lun
+# and returns list to stdout
+getluns()
+{
+  sgdevice
+  if test -z "$SGDEV"; then return 1; fi
+  if test ! -x /usr/bin/sg_luns; then echo 0; return 1; fi
+  LLUN=`sg_luns /dev/$SGDEV 2>/dev/null | sed -n 's/    \(.*\)/\1/p'`
+  if test $? != 0; then echo 0; return 1; fi
+  #echo "$LLUN" | sed -n 's/.*lun=\(.*\)/\1/p'
+  for lun in $LLUN ; do
+      # Swap LUN number
+      l0=$(printf '%u' 0x$lun)
+      l1=$(( ($l0 >> 48) & 0xffff ))
+      l2=$(( ($l0 >> 32) & 0xffff )) 
+      l3=$(( ($l0 >> 16) & 0xffff ))
+      l4=$(( $l0 & 0xffff ))
+      l0=$(( ( ( ($l4 * 0xffff) + $l3 ) * 0xffff + $l2 ) * 0xffff + $l1 ))
+      printf "%u\n" $l0
+  done
+  return 0
+}
+
+# Wait for udev to settle (create device nodes etc.)
+udevadm_settle()
+{
+  if test -x /sbin/udevadm; then 
+    print_and_scroll_back " Calling udevadm settle (can take a while) "
+    /sbin/udevadm settle
+    white_out
+  elif test -x /sbin/udevsettle; then
+    print_and_scroll_back " Calling udevsettle (can take a while) "
+    /sbin/udevsettle
+    white_out
+  else
+    usleep 20000
+  fi
+}
+
+# Perform scan on a single lun $host $channel $id $lun
+dolunscan()
+{
+  SCSISTR=
+  devnr="$host $channel $id $lun"
+  echo -e " Scanning for device $devnr ... "
+  printf "${yellow}OLD: $norm"
+  testexist
+  # Special case: lun 0 just got added (for reportlunscan),
+  # so make sure we correctly treat it as new
+  if test "$lun" = "0" -a "$1"; then
+    SCSISTR=""
+    printf "\r\e[A\e[A\e[A"
+  fi
+  : f $remove s $SCSISTR
+  if test "$remove" -a "$SCSISTR"; then
+    # Device exists: Test whether it's still online
+    # (testonline returns 1 if it's gone or has changed)
+    testonline
+    RC=$?
+    if test $RC != 0 -o ! -z "$forceremove"; then
+      echo -en "\r\e[A\e[A\e[A${red}REM: "
+      echo "$SCSISTR" | head -n1
+      echo -e "${norm}\e[B\e[B"
+      if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then
+        echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/delete
+	# FIXME: Can we skip udevadm settle for removal?
+	#udevadm_settle
+	usleep 20000
+      else
+        echo "scsi remove-single-device $devnr" > /proc/scsi/scsi
+	if test $RC -eq 1 -o $lun -eq 0 ; then
+          # Try readding, should fail if device is gone
+          echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+	fi
+      fi
+    fi
+    if test $RC = 0 -o "$forcerescan" ; then
+      if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then
+        echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/rescan
+	udevadm_settle
+      fi
+    fi
+    printf "\r\e[A\e[A\e[A${yellow}OLD: $norm"
+    testexist
+    if test -z "$SCSISTR"; then
+      printf "\r${red}DEL: $norm\r\n\n"
+      let rmvd+=1;
+      return 1
+    fi
+  fi
+  if test -z "$SCSISTR"; then
+    # Device does not exist, try to add
+    printf "\r${green}NEW: $norm"
+    if test -e /sys/class/scsi_host/host${host}/scan; then
+      echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null
+      udevadm_settle
+    else
+      echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+    fi
+    testexist
+    if test -z "$SCSISTR"; then
+      # Device not present
+      printf "\r\e[A";
+      # Optimization: if lun==0, stop here (only if in non-remove mode)
+      if test $lun = 0 -a -z "$remove" -a $optscan = 1; then 
+        break;
+      fi
+    else 
+      let found+=1; 
+    fi
+  fi
+}
+
+# Perform report lun scan on $host $channel $id using REPORT_LUNS
+doreportlun()
+{
+  lun=0
+  SCSISTR=
+  devnr="$host $channel $id $lun"
+  echo -en " Scanning for device $devnr ...\r"
+  lun0added=
+  #printf "${yellow}OLD: $norm"
+  # Phase one: If LUN0 does not exist, try to add
+  testexist -q
+  if test -z "$SCSISTR"; then
+    # Device does not exist, try to add
+    #printf "\r${green}NEW: $norm"
+    if test -e /sys/class/scsi_host/host${host}/scan; then
+      echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null
+      udevadm_settle
+    else
+      echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+    fi
+    testexist -q
+    if test -n "$SCSISTR"; then
+      lun0added=1
+      #testonline
+    else
+      # Device not present
+      # return
+      # Find alternative LUN to send getluns to
+      for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do
+        [ -d "$dev" ] || continue
+	lun=${dev##*:}
+        break
+      done
+    fi
+  fi
+  targetluns=`getluns`
+  REPLUNSTAT=$?
+  lunremove=
+  #echo "getluns reports " $targetluns
+  olddev=`find /sys/class/scsi_device/ -name $host:$channel:$id:* 2>/dev/null`
+  oldluns=`echo "$olddev" | awk -F'/' '{print $5}' | awk -F':' '{print $4}'`
+  oldtargets="$targetluns"
+  # OK -- if we don't have a LUN to send a REPORT_LUNS to, we could
+  # fall back to wildcard scanning. Same thing if the device does not
+  # support REPORT_LUNS
+  # TODO: We might be better off to ALWAYS use wildcard scanning if 
+  # it works
+  if test "$REPLUNSTAT" = "1"; then
+    if test -e /sys/class/scsi_host/host${host}/scan; then
+      echo "$channel $id -" > /sys/class/scsi_host/host${host}/scan 2> /dev/null
+      udevadm_settle
+    else
+      echo "scsi add-single-device $host $channel $id $SCAN_WILD_CARD" > /proc/scsi/scsi
+    fi
+    targetluns=`find /sys/class/scsi_device/ -name $host:$channel:$id:* 2>/dev/null | awk -F'/' '{print $5}' | awk -F':' '{print $4}' | sort -n`
+    let found+=`echo "$targetluns" | wc -l`
+    let found-=`echo "$olddev" | wc -l`
+  fi
+  if test -z "$targetluns"; then targetluns="$oldtargets"; fi
+  # Check existing luns
+  for dev in $olddev; do
+    [ -d "$dev" ] || continue
+    lun=${dev##*:}
+    newsearch=
+    inlist=
+    # OK, is existing $lun (still) in reported list
+    for tmplun in $targetluns; do
+      if test $tmplun -eq $lun ; then
+	inlist=1
+	dolunscan $lun0added
+      else
+	newsearch="$newsearch $tmplun"
+      fi
+    done
+    # OK, we have now done a lunscan on $lun and 
+    # $newsearch is the old $targetluns without $lun
+    if [ -z "$inlist" ]; then
+      # Stale lun
+      lunremove="$lunremove $lun"
+    fi
+    # $lun removed from $lunsearch (echo for whitespace cleanup)
+    targetluns=`echo $newsearch`
+  done
+  # Add new ones and check stale ones
+  for lun in $targetluns $lunremove; do
+    dolunscan $lun0added
+  done
+}
+
+# Perform search (scan $host)
+dosearch ()
+{
+  if test -z "$channelsearch" ; then
+    chanlist
+  fi
+  for channel in $channelsearch; do
+    if test -z "$idsearch" ; then
+      idlist
+    fi
+    for id in $idsearch; do
+      if test -z "$lunsearch" ; then
+	doreportlun
+      else
+	for lun in $lunsearch; do
+          dolunscan
+        done
+      fi
+    done
+  done
+}
+ 
+expandlist ()
+{
+  list=$1
+  result=""
+  first=${list%%,*}
+  rest=${list#*,}
+  while test ! -z "$first"; do 
+    beg=${first%%-*};
+    if test "$beg" = "$first"; then
+      result="$result $beg";
+    else
+      end=${first#*-}
+      result="$result `seq $beg $end`"
+    fi
+    test "$rest" = "$first" && rest=""
+    first=${rest%%,*}
+    rest=${rest#*,}
+  done
+  echo $result
+}
+
+# main
+if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then
+    echo "Usage: rescan-scsi-bus.sh [options] [host [host ...]]"
+    echo "Options:"
+    echo " -l      activates scanning for LUNs 0--7   [default: 0]"
+    echo " -L NUM  activates scanning for LUNs 0--NUM [default: 0]"
+    echo " -w      scan for target device IDs 0--15   [default: 0--7]"
+    echo " -c      enables scanning of channels 0 1   [default: 0 / all detected ones]"
+    echo " -r      enables removing of devices        [default: disabled]"
+    echo " -i      issue a FibreChannel LIP reset     [default: disabled]"
+    echo "--remove:        same as -r"
+    echo "--issue-lip:     same as -i"
+    echo "--forcerescan:   Rescan existing devices"
+    echo "--forceremove:   Remove and readd every device (DANGEROUS)"
+    echo "--nooptscan:     don't stop looking for LUNs is 0 is not found"
+    echo "--color:         use coloured prefixes OLD/NEW/DEL"
+    echo "--hosts=LIST:    Scan only host(s) in LIST"
+    echo "--channels=LIST: Scan only channel(s) in LIST"
+    echo "--ids=LIST:      Scan only target ID(s) in LIST"
+    echo "--luns=LIST:     Scan only lun(s) in LIST"  
+    echo "--sync/nosync:   Issue a sync / no sync [default: sync if remove]"
+    echo "--attachpq3:     Tell kernel to attach sg to LUN 0 that reports PQ=3"
+    echo "--reportlun2:    Tell kernel to try REPORT_LUN even on SCSI2 devices"
+    echo "--largelun:      Tell kernel to support LUNs > 7 even on SCSI2 devs"
+    echo "--sparselun:     Tell kernel to support sparse LUN numbering"
+    echo " Host numbers may thus be specified either directly on cmd line (deprecated) or"
+    echo " or with the --hosts=LIST parameter (recommended)."
+    echo "LIST: A[-B][,C[-D]]... is a comma separated list of single values and ranges"
+    echo " (No spaces allowed.)"
+    exit 0
+fi
+
+if test ! -d /sys/class/scsi_host/ -a ! -d /proc/scsi/; then
+  echo "Error: SCSI subsystem not active"
+  exit 1
+fi	
+
+# Make sure sg is there
+modprobe sg >/dev/null 2>&1
+
+if test -x /usr/bin/sg_inq; then
+    sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3)
+    sg_version=${sg_version##0.}
+    #echo "\"$sg_version\""
+    #if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then
+        #sg_len_arg="-36"
+    #else
+        sg_len_arg="--len=36"
+    #fi
+else
+    echo "WARN: /usr/bin/sg_inq not present -- please install sg3_utils"
+    echo " or rescan-scsi-bus.sh might not fully work."     
+fi    
+
+# defaults
+unsetcolor
+lunsearch=
+opt_idsearch=`seq 0 7`
+opt_channelsearch=
+remove=
+forceremove=
+optscan=1
+sync=1
+declare -i scan_flags=0
+if test -d /sys/class/scsi_host; then 
+  findhosts_26
+else  
+  findhosts
+fi  
+
+# Scan options
+opt="$1"
+while test ! -z "$opt" -a -z "${opt##-*}"; do
+  opt=${opt#-}
+  case "$opt" in
+    l) lunsearch=`seq 0 7` ;;
+    L) lunsearch=`seq 0 $2`; shift ;;
+    w) opt_idsearch=`seq 0 15` ;;
+    c) opt_channelsearch="0 1" ;;
+    r) remove=1 ;;
+    i) lipreset=1 ;;
+    -remove)      remove=1 ;;
+    -forcerescan) remove=1; forcerescan=1 ;;
+    -forceremove) remove=1; forceremove=1 ;;
+    -hosts=*)     arg=${opt#-hosts=};   hosts=`expandlist $arg` ;;
+    -channels=*)  arg=${opt#-channels=};opt_channelsearch=`expandlist $arg` ;; 
+    -ids=*)   arg=${opt#-ids=};         opt_idsearch=`expandlist $arg` ;; 
+    -luns=*)  arg=${opt#-luns=};        lunsearch=`expandlist $arg` ;; 
+    -color) setcolor ;;
+    -nooptscan) optscan=0 ;;
+    -issue-lip) lipreset=1 ;;
+    -sync) sync=2 ;;
+    -nosync) sync=0 ;;
+    -attachpq3) scan_flags=$(($scan_flags|0x1000000)) ;;
+    -reportlun2) scan_flags=$(($scan_flags|0x20000)) ;;
+    -largelun) scan_flags=$(($scan_flags|0x200)) ;;
+    -sparselun) scan_flags=$((scan_flags|0x40)) ;;
+    *) echo "Unknown option -$opt !" ;;
+  esac
+  shift
+  opt="$1"
+done    
+
+# Hosts given ?
+if test "@$1" != "@"; then 
+  hosts=$*
+fi
+
+if [ -d /sys/class/scsi_host -a ! -w /sys/class/scsi_host ]; then
+  echo "You need to run scsi-rescan-bus.sh as root"
+  exit 2
+fi  
+if test "$sync" = 1 -a "$remove" = 1; then sync=2; fi
+if test "$sync" = 2; then echo "Syncing file systems"; sync; fi
+if test -w /sys/module/scsi_mod/parameters/default_dev_flags -a $scan_flags != 0; then
+  OLD_SCANFLAGS=`cat /sys/module/scsi_mod/parameters/default_dev_flags`
+  NEW_SCANFLAGS=$(($OLD_SCANFLAGS|$scan_flags))
+  if test "$OLD_SCANFLAGS" != "$NEW_SCANFLAGS"; then
+    echo -n "Temporarily setting kernel scanning flags from "
+    printf "0x%08x to 0x%08x\n" $OLD_SCANFLAGS $NEW_SCANFLAGS
+    echo $NEW_SCANFLAGS > /sys/module/scsi_mod/parameters/default_dev_flags
+  else
+    unset OLD_SCANFLAGS
+  fi
+fi  
+echo "Scanning SCSI subsystem for new devices"
+test -z "$remove" || echo " and remove devices that have disappeared"
+declare -i found=0
+declare -i rmvd=0
+for host in $hosts; do
+  echo -n "Scanning host $host "
+  if test -e /sys/class/fc_host/host$host ; then
+    # It's pointless to do a target scan on FC
+    if test -n "$lipreset" ; then
+      echo 1 > /sys/class/fc_host/host$host/issue_lip 2> /dev/null;
+      udevadm_settle
+    fi
+    # We used to always trigger a rescan for FC to update channels and targets
+    # Commented out -- as discussed with Hannes we should rely
+    # on the main loop doing the scan, no need to do it here.
+    #echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null;
+    #udevadm_settle
+    channelsearch=
+    idsearch=
+  else
+    channelsearch=$opt_channelsearch
+    idsearch=$opt_idsearch
+  fi
+  [ -n "$channelsearch" ] && echo -n "channels $channelsearch "
+  echo -n "for "
+  if [ -n "$idsearch" ] ; then
+    echo -n " SCSI target IDs " $idsearch
+  else
+    echo -n " all SCSI target IDs"
+  fi
+  if [ -n "$lunsearch" ] ; then
+    echo ", LUNs " $lunsearch
+  else
+    echo ", all LUNs"
+  fi
+  dosearch
+done
+if test -n "$OLD_SCANFLAGS"; then
+  echo $OLD_SCANFLAGS > /sys/module/scsi_mod/parameters/default_dev_flags
+fi
+echo "$found new device(s) found.               "
+echo "$rmvd device(s) removed.                 "
+
+# Local Variables:
+# sh-basic-offset: 2
+# End:
+