diff options
Diffstat (limited to 'default-config/etc')
-rw-r--r-- | default-config/etc/archiso/getshell | 18 | ||||
-rw-r--r-- | default-config/etc/pam.d/su | 12 | ||||
-rw-r--r-- | default-config/etc/passwd | 14 | ||||
-rw-r--r-- | default-config/etc/rc.d/archiso | 126 | ||||
-rw-r--r-- | default-config/etc/shadow | 14 | ||||
-rw-r--r-- | default-config/etc/sudoers | 4 |
6 files changed, 94 insertions, 94 deletions
diff --git a/default-config/etc/archiso/getshell b/default-config/etc/archiso/getshell index 41ec0c6..a6f8775 100644 --- a/default-config/etc/archiso/getshell +++ b/default-config/etc/archiso/getshell @@ -1,9 +1,9 @@ -#!/bin/sh
-
-. /etc/archiso/functions
-
-shell="$(cmdline_param shell)"
-[ -n "${shell}" ] && shell="/bin/bash"
-[ ! -e "${shell}" ] && shell="/bin/sh"
-
-exec ${shell}
+#!/bin/sh + +. /etc/archiso/functions + +shell="$(cmdline_param shell)" +[ -n "${shell}" ] && shell="/bin/bash" +[ ! -e "${shell}" ] && shell="/bin/sh" + +exec ${shell} diff --git a/default-config/etc/pam.d/su b/default-config/etc/pam.d/su index 1bac343..a291042 100644 --- a/default-config/etc/pam.d/su +++ b/default-config/etc/pam.d/su @@ -1,6 +1,6 @@ -#%PAM-1.0
-auth sufficient pam_rootok.so
-auth sufficient pam_wheel.so trust use_uid
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
+#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_wheel.so trust use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/default-config/etc/passwd b/default-config/etc/passwd index fc64eab..f93d445 100644 --- a/default-config/etc/passwd +++ b/default-config/etc/passwd @@ -1,7 +1,7 @@ -root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:
-daemon:x:2:2:daemon:/sbin:
-mail:x:8:12:mail:/var/spool/mail:
-ftp:x:14:11:ftp:/home/ftp:
-nobody:x:99:99:nobody:/:
-arch::1000:100:users:/home/arch:/bin/bash
+root:x:0:0:root:/root:/bin/bash +bin:x:1:1:bin:/bin: +daemon:x:2:2:daemon:/sbin: +mail:x:8:12:mail:/var/spool/mail: +ftp:x:14:11:ftp:/home/ftp: +nobody:x:99:99:nobody:/: +arch::1000:100:users:/home/arch:/bin/bash diff --git a/default-config/etc/rc.d/archiso b/default-config/etc/rc.d/archiso index 17525ea..661bcbd 100644 --- a/default-config/etc/rc.d/archiso +++ b/default-config/etc/rc.d/archiso @@ -1,63 +1,63 @@ -# vim: set ft=sh:
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/archiso/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" " ")
-
-}
-
-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
-}
+# vim: set ft=sh: +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/archiso/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" " ") + +} + +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 +} diff --git a/default-config/etc/shadow b/default-config/etc/shadow index 39e1da7..a8887b7 100644 --- a/default-config/etc/shadow +++ b/default-config/etc/shadow @@ -1,7 +1,7 @@ -root::99999::::::
-bin:x:0::::::
-daemon:x:0::::::
-mail:x:0::::::
-ftp:x:0::::::
-nobody:x:0::::::
-arch::12922:0:99999:7:::
+root::99999:::::: +bin:x:0:::::: +daemon:x:0:::::: +mail:x:0:::::: +ftp:x:0:::::: +nobody:x:0:::::: +arch::12922:0:99999:7::: diff --git a/default-config/etc/sudoers b/default-config/etc/sudoers index 7121a22..861c55a 100644 --- a/default-config/etc/sudoers +++ b/default-config/etc/sudoers @@ -1,2 +1,2 @@ -root ALL=(ALL) ALL
-%wheel localhost=(ALL) NOPASSWD: ALL
+root ALL=(ALL) ALL +%wheel localhost=(ALL) NOPASSWD: ALL |