Corrected DOS newlines... whoops

git-svn-id: http://phraktured.net/archiso@16 00a9fe69-e71b-0410-bb23-df0e5024db41

11 files changed, 169 insertions, 171 deletions

diff --git a/default-config/boot/grub/help.lst b/default-config/boot/grub/help.lst
index b9468eb..36a4ea3 100644
--- a/default-config/boot/grub/help.lst
+++ b/default-config/boot/grub/help.lst
@@ -10,7 +10,3 @@ configfile /boot/grub/menu.lst
 title    HOW-TO: Boot an existing system
 cat /boot/help/bootexisting.txt
 pause Press enter to continue...
-
-title    HOW-TO: Do some other shit
-cat /boot/help/othershit.txt
-pause Press enter to continue...
diff --git a/default-config/boot/grub/menu.lst b/default-config/boot/grub/menu.lst
index f25c9fe..dac552a 100644
--- a/default-config/boot/grub/menu.lst
+++ b/default-config/boot/grub/menu.lst
@@ -1,25 +1,25 @@
-

-timeout 300

-default 0

-color light-blue/blue black/light-grey

-splashimage=/boot/splash.xpm.gz

-

-title  Boot ArchLive

-kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%

-initrd /boot/archlive.img

-

-title Tools...

-configfile /boot/grub/tools.lst

-

-title View Help...

-configfile /boot/grub/help.lst

-

-title More Options...

-configfile /boot/grub/more.lst

-

-title  Shutdown the Computer

-halt

-

-title  Reboot the Computer

-reboot

-

+
+timeout 300
+default 0
+color light-blue/blue black/light-grey
+splashimage=/boot/splash.xpm.gz
+
+title  Boot ArchLive
+kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%
+initrd /boot/archlive.img
+
+title Tools...
+configfile /boot/grub/tools.lst
+
+title View Help...
+configfile /boot/grub/help.lst
+
+title More Options...
+configfile /boot/grub/more.lst
+
+title  Shutdown the Computer
+halt
+
+title  Reboot the Computer
+reboot
+
diff --git a/default-config/boot/grub/more.lst b/default-config/boot/grub/more.lst
index a8450f3..9a2f165 100644
--- a/default-config/boot/grub/more.lst
+++ b/default-config/boot/grub/more.lst
@@ -10,8 +10,9 @@ title    Attempt existing Linux detection
 configfile /boot/grub/tryboot.lst
 
 title    [EDIT ME] Boot Existing Linux Install
-root   (hd0,1)
+root   (hd0,0)
 kernel /vmlinuz26 root=/dev/hda3 ro
+initrd /kernel26.img
 
 title    [EDIT ME] Boot Existing Windows Install
 rootnoverify (hd0,0)
diff --git a/default-config/boot/grub/tools.lst b/default-config/boot/grub/tools.lst
index ef7cabc..be30408 100644
--- a/default-config/boot/grub/tools.lst
+++ b/default-config/boot/grub/tools.lst
@@ -1,27 +1,27 @@
-timeout 300

-default 0

-color light-blue/blue black/light-grey

-splashimage=/boot/splash.xpm.gz

-

-title << Back to Main Menu

-configfile /boot/grub/menu.lst

-

-title    Run memtest86+ (Memory Testing)

-kernel /boot/memtest86+/memtest.bin

-

-# http://www.vortex.prodigynet.co.uk/x86test/

-title    Run x86test (CPU Info)

-kernel /boot/x86test_zImage.bin

-#wget http://www.vortex.prodigynet.co.uk/x86test/x86test_zImage.bin

-

-# http://home.san.rr.com/johninsd/pub/linux/lilo/boot/

-title    LILO Diagnostic

-kernel /boot/diag2.img

-

-title    Install GRUB to hd0 MBR

-root  (hd0,0)

-setup (hd0)

-

-# http://www.erikyyy.de/invaders/

-title    Space Invaders!!

-kernel /boot/invaders.img

+timeout 300
+default 0
+color light-blue/blue black/light-grey
+splashimage=/boot/splash.xpm.gz
+
+title << Back to Main Menu
+configfile /boot/grub/menu.lst
+
+title    Run memtest86+ (Memory Testing)
+kernel /boot/memtest86+/memtest.bin
+
+# http://www.vortex.prodigynet.co.uk/x86test/
+title    Run x86test (CPU Info)
+kernel /boot/x86test_zImage.bin
+#wget http://www.vortex.prodigynet.co.uk/x86test/x86test_zImage.bin
+
+# http://home.san.rr.com/johninsd/pub/linux/lilo/boot/
+title    LILO Diagnostic
+kernel /boot/diag2.img
+
+title    Install GRUB to hd0 MBR
+root  (hd0,0)
+setup (hd0)
+
+# http://www.erikyyy.de/invaders/
+title    Space Invaders!!
+kernel /boot/invaders.img
diff --git a/default-config/boot/help/bootexisting.txt b/default-config/boot/help/bootexisting.txt
index 1c27625..540e41f 100644
--- a/default-config/boot/help/bootexisting.txt
+++ b/default-config/boot/help/bootexisting.txt
@@ -1,23 +1,24 @@
-This is a helpfile
-
-Hopefully grub will make this happy....
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+HOWTO: Boot an existing install
+
+Select "More Options" from the main menu.
+Move the cursor to "[EDIT ME] Boot an existing linux install"
+Press "e"
+
+At this point you will see the following:
+     root   (hd0,0)
+     kernel /vmlinuz26 root=/dev/hda3 ro
+     initrd /kernel26.img
+
+This needs to be changed to accomodate your hardware.
+
+The first line should be changed to indicate where your boot medium resides.
+  "(hd0,0)" is the first partition on the first hard drive (hda1) - change these
+  numbers to indicate the partition containing your /boot directory.
+  
+The second line should be changed to point to your kernel.  If the line above
+points to a partition _only_ containing /boot, then /vmlinuz26 is fine.
+Otherwise, change this to /boot/vmlinuz.  root= should be changed to match the
+partition for your root filesystem.  Other kernel parameters can be added here.
 
 
 
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