diff options
Diffstat (limited to '')
| -rw-r--r-- | source/installer/sources/busybox/busybox-dot-config | 6 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/etc/rc.d/rc.S | 21 | ||||
| l---------[-rwxr-xr-x] | source/installer/sources/initrd/sbin/rescan-scsi-bus | 760 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/SeTpartitions | 77 |
4 files changed, 91 insertions, 773 deletions
diff --git a/source/installer/sources/busybox/busybox-dot-config b/source/installer/sources/busybox/busybox-dot-config index 866752902..ad3d6ea47 100644 --- a/source/installer/sources/busybox/busybox-dot-config +++ b/source/installer/sources/busybox/busybox-dot-config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.32.1 -# Sun Jan 17 13:37:03 2021 +# Tue May 14 13:21:58 2024 # CONFIG_HAVE_DOT_CONFIG=y @@ -941,8 +941,8 @@ CONFIG_PSCAN=y CONFIG_ROUTE=y CONFIG_SLATTACH=y CONFIG_SSL_CLIENT=y -CONFIG_TC=y -CONFIG_FEATURE_TC_INGRESS=y +# CONFIG_TC is not set +# CONFIG_FEATURE_TC_INGRESS is not set CONFIG_TCPSVD=y CONFIG_UDPSVD=y CONFIG_TELNET=y diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S index 0e69d7349..c798c9d18 100755 --- a/source/installer/sources/initrd/etc/rc.d/rc.S +++ b/source/installer/sources/initrd/etc/rc.d/rc.S @@ -139,6 +139,27 @@ else fi # End Run udev: +# Set up some swap on a ZRAM device: +ZRAMSIZE=$(echo $(cat /proc/meminfo | grep ^MemTotal:) | cut -f 2 -d ' ') +ZRAMCOMPRESSION=zstd +ZRAMPRIORITY=100 +if [ ! -d /sys/devices/virtual/block/zram0 ]; then + modprobe zram +fi +# In case of a 32-bit kernel, we are limited to 4G maximum ZRAM device size. +# If the RAM size is greater than 4G, then use 4G for the ZRAMSIZE. +if [ "$(uname -m)" = "i686" ]; then + if [ "$ZRAMSIZE" -gt "4194304" ]; then + ZRAMSIZE=4194304 + fi +fi +ZRAM_DEVICE=$(/sbin/zramctl -f -a $ZRAMCOMPRESSION -s ${ZRAMSIZE}K) +if [ ! -z $ZRAM_DEVICE ]; then + /sbin/mkswap $ZRAM_DEVICE + /sbin/swapon -p $ZRAMPRIORITY $ZRAM_DEVICE +fi +unset ZRAMCOMPRESSION ZRAM_DEVICE ZRAMPRIORITY ZRAMSIZE + # Here's the situation. Because of the practice of keeping the local # time (rather than UTC) in the system's clock, at any given time half # of the people doing an install will be creating files that upon diff --git a/source/installer/sources/initrd/sbin/rescan-scsi-bus b/source/installer/sources/initrd/sbin/rescan-scsi-bus index 4be8f01e1..106125246 100755..120000 --- a/source/installer/sources/initrd/sbin/rescan-scsi-bus +++ b/source/installer/sources/initrd/sbin/rescan-scsi-bus @@ -1,759 +1 @@ -#!/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"; - ## COMMENTED OUT as the "break" below is broken. - ## 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 -# # Slackware note: it may not "fully work", but it works well enough for -# # what we need here in the installer. If that turns out not to be the -# # case, let volkerdi know on the Slackware Linux Questions forum. -# 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: - +../usr/bin/rescan-scsi-bus.sh
\ No newline at end of file diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTpartitions b/source/installer/sources/initrd/usr/lib/setup/SeTpartitions index 279edd94a..2a73ba5e5 100755 --- a/source/installer/sources/initrd/usr/lib/setup/SeTpartitions +++ b/source/installer/sources/initrd/usr/lib/setup/SeTpartitions @@ -35,6 +35,50 @@ Filesystem type: f2fs " 0 0 mkfs.f2fs -f $1 1> $REDIR 2> $REDIR } +# make_bcachefs( dev ) - Create a new bcachefs filesystem on the named dev. +# Parameters: dev Device node to format. +make_bcachefs() { + dialog --title "BCACHEFS COMPRESSION" --default-item "none" --menu \ + "Bcachefs supports on-the-fly compression/decompression to make the \ + most of your storage. If you'd like to use filesystem compression, \ + select one of the options below. Note that bcachefs has a lot of \ + options for compression, such as different levels, or compressing \ + in the background to eliminate write lag. These basic options will \ + get you going, though. Bcachefs filesystem options can be changed \ + later with \"bcachefs set-option\"." \ + 17 76 4 \ + "none" "Do not use filesystem compression" \ + "zstd" "Fast writes and very good compression ratio" \ + "lz4" "Very fast writes and good compression ratio" \ + "gzip" "Relatively useless, but be my guest" 2> $TMP/SeTcompress + if [ ! $? = 0 ]; then + rm -f $TMP/SeTcompress + exit + fi + if [ -r $TMP/SeTcompress ]; then + BCACHEFS_COMPRESSION="$(cat $TMP/SeTcompress)" + else + BCACHEFS_COMPRESSION=none + fi + # get the size of the named partition + SIZE=`get_part_size $1` + # output a nice status message + dialog --title "FORMATTING" \ + --backtitle "Formatting $1 with filesystem bcachefs, compression type $BCACHEFS_COMPRESSION." \ + --infobox "Formatting $1 \n\ +Size: $SIZE \n\ +Compression: $BCACHEFS_COMPRESSION \n\ +Filesystem type: bcachefs " 0 0 + # do the format + if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then + umount $1 2> $NDIR + fi + mkfs.bcachefs -f --compression=$BCACHEFS_COMPRESSION $1 1> $REDIR 2> $REDIR + # mkfs.bcachefs is so ridiculously fast that we'd better pause for a moment + # or folks will wonder if the format failed + sleep 3 +} + # make_btrfs( dev ) - Create a new btrfs filesystem on the named dev. # Parameters: dev Device node to format. make_btrfs() { @@ -45,7 +89,7 @@ make_btrfs() { --backtitle "Formatting $1 with filesystem btrfs." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: btrfs " 0 0 +Filesystem type: btrfs " 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -65,7 +109,7 @@ make_ext2() { --backtitle "Formatting $1 with filesystem ext2." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: ext2" 0 0 +Filesystem type: ext2" 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -89,7 +133,7 @@ make_ext3() { --backtitle "Formatting $1 with filesystem ext3." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: ext3" 0 0 +Filesystem type: ext3" 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -113,7 +157,7 @@ make_ext4() { --backtitle "Formatting $1 with filesystem ext4." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: ext4" 0 0 +Filesystem type: ext4" 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -137,7 +181,7 @@ make_jfs() { --backtitle "Formatting $1 with filesystem jfs." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: jfs" 0 0 +Filesystem type: jfs" 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -159,7 +203,7 @@ make_reiserfs() { --backtitle "Formatting $1 with filesystem reiserfs." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: reiserfs " 0 0 +Filesystem type: reiserfs " 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -177,7 +221,7 @@ make_xfs() { --backtitle "Formatting $1 with filesystem xfs." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: xfs " 0 0 +Filesystem type: xfs " 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -238,7 +282,7 @@ to format this partition?" 12 70 3 \ # ask_fs( dev ) - Asks the user the type of filesystem to use for the named # device. Answer in $TMP/return ask_fs() { - unset BTRFS EXT2 EXT3 F2FS JFS REISERFS XFS + unset BCACHEFS BTRFS EXT2 EXT3 F2FS JFS REISERFS XFS if grep -wq ext2 /proc/filesystems 1> $NDIR 2> $NDIR ; then EXT2="Ext2 is the traditional Linux file system and is fast and stable. " fi @@ -250,8 +294,12 @@ ask_fs() { EXT4="Ext4 is the successor to the ext3 filesystem. " DEFAULT=ext4 fi - if grep -wq reiserfs /proc/filesystems 1> $NDIR 2> $NDIR ; then - REISERFS="ReiserFS is a journaling filesystem that stores all files and filenames in a balanced tree structure. " + # This will be gone in Linux 6.10, so it's probably time to quit offering it. + #if grep -wq reiserfs /proc/filesystems 1> $NDIR 2> $NDIR ; then + # REISERFS="ReiserFS is a journaling filesystem that stores all files and filenames in a balanced tree structure. " + #fi + if grep -wq bcachefs /proc/filesystems 1> $NDIR 2> $NDIR ; then + BCACHEFS="Bcachefs is a B-tree copy-on-write filesystem. " fi if grep -wq btrfs /proc/filesystems 1> $NDIR 2> $NDIR ; then BTRFS="Btrfs is a B-tree copy-on-write filesystem. " @@ -272,7 +320,7 @@ dialog --title "SELECT FILESYSTEM FOR $1" \\ --backtitle "Partition $1 will be formatted." \\ --default-item $DEFAULT --menu \\ "Please select the type of filesystem to use for the specified \\ -device. Here are descriptions of the available filesystems: $EXT2 $EXT3 $EXT4 $BTRFS $F2FS $JFS $REISERFS $XFS" \\ +device. Here are descriptions of the available filesystems: $EXT2 $EXT3 $EXT4 $BCACHEFS $BTRFS $F2FS $JFS $REISERFS $XFS" \\ 0 0 0 \\ EOF if [ ! "$EXT2" = "" ]; then @@ -290,6 +338,9 @@ EOF if [ ! "$REISERFS" = "" ]; then echo "\"reiserfs\" \"ReiserFS Journaling Filesystem\" \\" >> $TMP/tempscript fi + if [ ! "$BCACHEFS" = "" ]; then + echo "\"bcachefs\" \"Bcachefs Copy-on-Write B-tree Filesystem\" \\" >> $TMP/tempscript + fi if [ ! "$BTRFS" = "" ]; then echo "\"btrfs\" \"Btrfs Copy-on-Write B-tree Filesystem\" \\" >> $TMP/tempscript fi @@ -374,6 +425,8 @@ if [ ! "$DOFORMAT" = "No" ]; then fi elif [ "$ROOT_SYS_TYPE" = "reiserfs" ]; then make_reiserfs $ROOT_DEVICE + elif [ "$ROOT_SYS_TYPE" = "bcachefs" ]; then + make_bcachefs $ROOT_DEVICE elif [ "$ROOT_SYS_TYPE" = "btrfs" ]; then make_btrfs $ROOT_DEVICE elif [ "$ROOT_SYS_TYPE" = "f2fs" ]; then @@ -478,6 +531,8 @@ EOF fi elif [ "$NEXT_SYS_TYPE" = "reiserfs" ]; then make_reiserfs $NEXT_PARTITION + elif [ "$NEXT_SYS_TYPE" = "bcachefs" ]; then + make_bcachefs $NEXT_PARTITION elif [ "$NEXT_SYS_TYPE" = "btrfs" ]; then make_btrfs $NEXT_PARTITION elif [ "$NEXT_SYS_TYPE" = "f2fs" ]; then |