Remove dead code from archiso rc.d scripts
This commit is contained in:
parent
5d775d7236
commit
8ee0dd8c39
@ -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}
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user