Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-09-19 18:08:10 +0000
committerAaron Griffin <aaron@archlinux.org>2006-09-19 18:08:10 +0000
commit59ddc5be61a1ee5dadc32c8a2255931d62bbce2a (patch)
treee68bbecc87bc854d3097d9dd6f8b850bc50325cc
parent8660ae6b5a7209f6583926673af75b52b1b4f523 (diff)
git-svn-id: http://phraktured.net/archiso@12 00a9fe69-e71b-0410-bb23-df0e5024db41
-rw-r--r--default-config/etc/archiso/functions2
-rw-r--r--default-config/etc/archiso/getshell1
-rw-r--r--default-config/etc/fstab2
-rw-r--r--default-config/etc/rc.conf1
-rw-r--r--default-config/etc/rc.d/archiso22
-rw-r--r--default-config/etc/rc.sysinit-proxy2
6 files changed, 21 insertions, 9 deletions
diff --git a/default-config/etc/archiso/functions b/default-config/etc/archiso/functions
index bf224dc..2972013 100644
--- a/default-config/etc/archiso/functions
+++ b/default-config/etc/archiso/functions
@@ -6,6 +6,6 @@ cmdline_param ()
$1=*) echo "${param##*=}"; break ;;
*) continue ;;
esac
+ echo "${2}"
done < read /proc/cmdline
- echo "${2}"
}
diff --git a/default-config/etc/archiso/getshell b/default-config/etc/archiso/getshell
index c61c56c..41ec0c6 100644
--- a/default-config/etc/archiso/getshell
+++ b/default-config/etc/archiso/getshell
@@ -1,6 +1,7 @@
#!/bin/sh
. /etc/archiso/functions
+
shell="$(cmdline_param shell)"
[ -n "${shell}" ] && shell="/bin/bash"
[ ! -e "${shell}" ] && shell="/bin/sh"
diff --git a/default-config/etc/fstab b/default-config/etc/fstab
index 74c69fd..4b118fc 100644
--- a/default-config/etc/fstab
+++ b/default-config/etc/fstab
@@ -7,3 +7,5 @@ none /dev/shm tmpfs defaults 0 0
tmpfs /tmp tmpfs defaults 0 0
/dev/cdrom /bootcd iso9660 ro,user,noauto 0 0
+
+### Auto generated entries get added here:
diff --git a/default-config/etc/rc.conf b/default-config/etc/rc.conf
index 91e96c1..1b8b9c9 100644
--- a/default-config/etc/rc.conf
+++ b/default-config/etc/rc.conf
@@ -20,3 +20,4 @@ ROUTES=()
#TODO add more auto-daemons here, especially the live-cd specific stuff
DAEMONS=(syslog-ng network crond)
+#TODO: auto-network find-disks find-user-home
diff --git a/default-config/etc/rc.d/archiso b/default-config/etc/rc.d/archiso
index 35ce22c..17525ea 100644
--- a/default-config/etc/rc.d/archiso
+++ b/default-config/etc/rc.d/archiso
@@ -1,9 +1,20 @@
# vim: set ft=sh:
. /etc/rc.conf
. /etc/rc.d/functions
-. /etc/archiso/functions # above goes in this file...
+. /etc/archiso/functions
-do_mounts ()
+
+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"
@@ -27,12 +38,7 @@ do_mounts ()
stat_done
}
-do_locale ()
-{
- #copy from rc.sysinit - use cmdline_param locale (or lang ?)
-}
-
-do_swap ()
+scan_swap ()
{
#Archie finds a pagefile.sys for windows/dos machines... may add later
stat_busy "Finding existing swap partitions"
diff --git a/default-config/etc/rc.sysinit-proxy b/default-config/etc/rc.sysinit-proxy
index 7b1bb50..f47156e 100644
--- a/default-config/etc/rc.sysinit-proxy
+++ b/default-config/etc/rc.sysinit-proxy
@@ -2,6 +2,8 @@
# we need a proxy script here to convert some /proc/cmdline
# parameters to rc.conf settings.
+. /etc/archlive/functions
+
LOCALE_DEFAULT="en_US.UTF-8"
TIMEZONE_DEFAULT="America/Chicago"
KEYMAP_DEFAULT="us"