[arch-releng] [PATCH 3/3] Remove dead code from archiso rc.d scripts

leone.simo at gmail.com leone.simo at gmail.com
Wed Mar 2 07:43:33 EST 2011


From: Simo Leone <leone.simo at gmail.com>

---
 configs/syslinux-iso/overlay/etc/archiso/getshell |    9 ---
 configs/syslinux-iso/overlay/etc/rc.d/archiso     |   59 ---------------------
 2 files changed, 0 insertions(+), 68 deletions(-)
 delete mode 100644 configs/syslinux-iso/overlay/etc/archiso/getshell

diff --git a/configs/syslinux-iso/overlay/etc/archiso/getshell b/configs/syslinux-iso/overlay/etc/archiso/getshell
deleted file mode 100644
index a6f8775..0000000
--- a/configs/syslinux-iso/overlay/etc/archiso/getshell
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. /etc/archiso/functions
-
-shell="$(cmdline_param shell)"
-[ -n "${shell}" ] && shell="/bin/bash"
-[ ! -e "${shell}" ] && shell="/bin/sh"
-
-exec ${shell}
diff --git a/configs/syslinux-iso/overlay/etc/rc.d/archiso b/configs/syslinux-iso/overlay/etc/rc.d/archiso
index 6f26f98..e1b5997 100755
--- a/configs/syslinux-iso/overlay/etc/rc.d/archiso
+++ b/configs/syslinux-iso/overlay/etc/rc.d/archiso
@@ -2,65 +2,6 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-
-scan_network ()
-{
-    netparam () { echo ${2} | sed "s|.*${1}\([^ ]*\).*|\1|gi"; }
-    #
-    netdevs=$(cat /proc/net/dev | grep ':' | cut -d':' -f1)
-    for net in ${netdev}; do
-        stats=$(ifconfig ${net} | tr -s "\n" " ")
-    done
-}
-
-scan_mount_pts ()
-{
-    #iterate over all block devices
-    stat_busy "Scanning local block devices"
-    for dev in $(echo /sys/block/*/dev /sys/block/*/*/dev); do
-
-        devname="/dev/$(echo ${dev} | cut -d'/' -f3,4 | cut -d'/' -f1)"
-        mountpt="/mnt/$(basename '${devname}')"
-            mkdir -p "${mountpt}" 2>/dev/null
-            mount ${options} "${devname}" "${mountpt}" >/dev/null 2>&1
-
-                fstype=$(awk '{ if ($1=="${devname}") { print $3" "$4;q }}' /proc/mounts)
-                fstype="${fstype%%,*}"
-                case "${fstype%% *}" in
-            *fat*|ntfs|*dos) options="user,exec,uid=0,gid=100,umask=00070" ;;
-            *) options="users,defaults,exec" ;;
-            #TODO handle 'sync' on usb devices... 
-        esac
-
-        echo "${devname} ${mountpt} ${fstype} ${options} 0 0 #configured by archiso" >>/etc/fstab
-    done
-    stat_done
-}
-
-scan_swap ()
-{
-    #Archie finds a pagefile.sys for windows/dos machines... may add later
-    stat_busy "Finding existing swap partitions"
-        swapdev="$(fdisk -l 2>/dev/null | grep swap | cut -d' ' -f1)"
-    if [ -e "${swapdev}" ]; then
-        swapon ${swapdev}
-        echo "${swapdev} swap swap defaults 0 0 #configured by archiso" >>/etc/fstab
-    fi
-    stat_done
-}
-
-do_homedir ()
-{
-    stat_busy "Scanning for existing HOME directory"
-    user="$(cmdline_param homeuser)"
-    for hdir in $(find /mnt -name "home/${user}" 2>/dev/null); do
-        mkdir -p "/home/arch/"
-        # break after the first success...
-        mount --bind "${hdir}" "/home/arch/" && break
-    done
-    stat_done
-}
-
 do_makeuser ()
 {
     stat_busy "Making the default user arch"
-- 
1.7.4.1



More information about the arch-releng mailing list