Corrected DOS newlines... whoops
git-svn-id: http://phraktured.net/archiso@16 00a9fe69-e71b-0410-bb23-df0e5024db41
This commit is contained in:
Aaron Griffin
parent
49284a96fa
commit
9b271cc997
@ -10,7 +10,3 @@ configfile /boot/grub/menu.lst
|
|||||||
title HOW-TO: Boot an existing system
|
title HOW-TO: Boot an existing system
|
||||||
cat /boot/help/bootexisting.txt
|
cat /boot/help/bootexisting.txt
|
||||||
pause Press enter to continue...
|
pause Press enter to continue...
|
||||||
|
|
||||||
title HOW-TO: Do some other shit
|
|
||||||
cat /boot/help/othershit.txt
|
|
||||||
pause Press enter to continue...
|
|
||||||
|
|||||||
@ -1,25 +1,25 @@
|
|||||||
|
|
||||||
timeout 300
|
timeout 300
|
||||||
default 0
|
default 0
|
||||||
color light-blue/blue black/light-grey
|
color light-blue/blue black/light-grey
|
||||||
splashimage=/boot/splash.xpm.gz
|
splashimage=/boot/splash.xpm.gz
|
||||||
|
|
||||||
title Boot ArchLive
|
title Boot ArchLive
|
||||||
kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%
|
kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%
|
||||||
initrd /boot/archlive.img
|
initrd /boot/archlive.img
|
||||||
|
|
||||||
title Tools...
|
title Tools...
|
||||||
configfile /boot/grub/tools.lst
|
configfile /boot/grub/tools.lst
|
||||||
|
|
||||||
title View Help...
|
title View Help...
|
||||||
configfile /boot/grub/help.lst
|
configfile /boot/grub/help.lst
|
||||||
|
|
||||||
title More Options...
|
title More Options...
|
||||||
configfile /boot/grub/more.lst
|
configfile /boot/grub/more.lst
|
||||||
|
|
||||||
title Shutdown the Computer
|
title Shutdown the Computer
|
||||||
halt
|
halt
|
||||||
|
|
||||||
title Reboot the Computer
|
title Reboot the Computer
|
||||||
reboot
|
reboot
|
||||||
|
|
||||||
|
|||||||
@ -10,8 +10,9 @@ title Attempt existing Linux detection
|
|||||||
configfile /boot/grub/tryboot.lst
|
configfile /boot/grub/tryboot.lst
|
||||||
|
|
||||||
title [EDIT ME] Boot Existing Linux Install
|
title [EDIT ME] Boot Existing Linux Install
|
||||||
root (hd0,1)
|
root (hd0,0)
|
||||||
kernel /vmlinuz26 root=/dev/hda3 ro
|
kernel /vmlinuz26 root=/dev/hda3 ro
|
||||||
|
initrd /kernel26.img
|
||||||
|
|
||||||
title [EDIT ME] Boot Existing Windows Install
|
title [EDIT ME] Boot Existing Windows Install
|
||||||
rootnoverify (hd0,0)
|
rootnoverify (hd0,0)
|
||||||
|
|||||||
@ -1,27 +1,27 @@
|
|||||||
timeout 300
|
timeout 300
|
||||||
default 0
|
default 0
|
||||||
color light-blue/blue black/light-grey
|
color light-blue/blue black/light-grey
|
||||||
splashimage=/boot/splash.xpm.gz
|
splashimage=/boot/splash.xpm.gz
|
||||||
|
|
||||||
title << Back to Main Menu
|
title << Back to Main Menu
|
||||||
configfile /boot/grub/menu.lst
|
configfile /boot/grub/menu.lst
|
||||||
|
|
||||||
title Run memtest86+ (Memory Testing)
|
title Run memtest86+ (Memory Testing)
|
||||||
kernel /boot/memtest86+/memtest.bin
|
kernel /boot/memtest86+/memtest.bin
|
||||||
|
|
||||||
# http://www.vortex.prodigynet.co.uk/x86test/
|
# http://www.vortex.prodigynet.co.uk/x86test/
|
||||||
title Run x86test (CPU Info)
|
title Run x86test (CPU Info)
|
||||||
kernel /boot/x86test_zImage.bin
|
kernel /boot/x86test_zImage.bin
|
||||||
#wget http://www.vortex.prodigynet.co.uk/x86test/x86test_zImage.bin
|
#wget http://www.vortex.prodigynet.co.uk/x86test/x86test_zImage.bin
|
||||||
|
|
||||||
# http://home.san.rr.com/johninsd/pub/linux/lilo/boot/
|
# http://home.san.rr.com/johninsd/pub/linux/lilo/boot/
|
||||||
title LILO Diagnostic
|
title LILO Diagnostic
|
||||||
kernel /boot/diag2.img
|
kernel /boot/diag2.img
|
||||||
|
|
||||||
title Install GRUB to hd0 MBR
|
title Install GRUB to hd0 MBR
|
||||||
root (hd0,0)
|
root (hd0,0)
|
||||||
setup (hd0)
|
setup (hd0)
|
||||||
|
|
||||||
# http://www.erikyyy.de/invaders/
|
# http://www.erikyyy.de/invaders/
|
||||||
title Space Invaders!!
|
title Space Invaders!!
|
||||||
kernel /boot/invaders.img
|
kernel /boot/invaders.img
|
||||||
|
|||||||
@ -1,23 +1,24 @@
|
|||||||
This is a helpfile
|
HOWTO: Boot an existing install
|
||||||
|
|
||||||
Hopefully grub will make this happy....
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
. /etc/archiso/functions
|
. /etc/archiso/functions
|
||||||
|
|
||||||
shell="$(cmdline_param shell)"
|
shell="$(cmdline_param shell)"
|
||||||
[ -n "${shell}" ] && shell="/bin/bash"
|
[ -n "${shell}" ] && shell="/bin/bash"
|
||||||
[ ! -e "${shell}" ] && shell="/bin/sh"
|
[ ! -e "${shell}" ] && shell="/bin/sh"
|
||||||
|
|
||||||
exec ${shell}
|
exec ${shell}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
#%PAM-1.0
|
#%PAM-1.0
|
||||||
auth sufficient pam_rootok.so
|
auth sufficient pam_rootok.so
|
||||||
auth sufficient pam_wheel.so trust use_uid
|
auth sufficient pam_wheel.so trust use_uid
|
||||||
auth required pam_unix.so
|
auth required pam_unix.so
|
||||||
account required pam_unix.so
|
account required pam_unix.so
|
||||||
session required pam_unix.so
|
session required pam_unix.so
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
root:x:0:0:root:/root:/bin/bash
|
root:x:0:0:root:/root:/bin/bash
|
||||||
bin:x:1:1:bin:/bin:
|
bin:x:1:1:bin:/bin:
|
||||||
daemon:x:2:2:daemon:/sbin:
|
daemon:x:2:2:daemon:/sbin:
|
||||||
mail:x:8:12:mail:/var/spool/mail:
|
mail:x:8:12:mail:/var/spool/mail:
|
||||||
ftp:x:14:11:ftp:/home/ftp:
|
ftp:x:14:11:ftp:/home/ftp:
|
||||||
nobody:x:99:99:nobody:/:
|
nobody:x:99:99:nobody:/:
|
||||||
arch::1000:100:users:/home/arch:/bin/bash
|
arch::1000:100:users:/home/arch:/bin/bash
|
||||||
|
|||||||
@ -1,63 +1,63 @@
|
|||||||
# vim: set ft=sh:
|
# vim: set ft=sh:
|
||||||
. /etc/rc.conf
|
. /etc/rc.conf
|
||||||
. /etc/rc.d/functions
|
. /etc/rc.d/functions
|
||||||
. /etc/archiso/functions
|
. /etc/archiso/functions
|
||||||
|
|
||||||
|
|
||||||
scan_network ()
|
scan_network ()
|
||||||
{
|
{
|
||||||
netparam () { echo ${2} | sed "s|.*${1}\([^ ]*\).*|\1|gi"; }
|
netparam () { echo ${2} | sed "s|.*${1}\([^ ]*\).*|\1|gi"; }
|
||||||
#
|
#
|
||||||
netdevs=$(cat /proc/net/dev | grep ':' | cut -d':' -f1)
|
netdevs=$(cat /proc/net/dev | grep ':' | cut -d':' -f1)
|
||||||
for net in ${netdev}; do
|
for net in ${netdev}; do
|
||||||
stats=$(ifconfig ${net} | tr -s "\n" " ")
|
stats=$(ifconfig ${net} | tr -s "\n" " ")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
scan_mount_pts ()
|
scan_mount_pts ()
|
||||||
{
|
{
|
||||||
#iterate over all block devices
|
#iterate over all block devices
|
||||||
stat_busy "Scanning local block devices"
|
stat_busy "Scanning local block devices"
|
||||||
for dev in $(echo /sys/block/*/dev /sys/block/*/*/dev); do
|
for dev in $(echo /sys/block/*/dev /sys/block/*/*/dev); do
|
||||||
|
|
||||||
devname="/dev/$(echo ${dev} | cut -d'/' -f3,4 | cut -d'/' -f1)"
|
devname="/dev/$(echo ${dev} | cut -d'/' -f3,4 | cut -d'/' -f1)"
|
||||||
mountpt="/mnt/$(basename '${devname}')"
|
mountpt="/mnt/$(basename '${devname}')"
|
||||||
mkdir -p "${mountpt}" 2>/dev/null
|
mkdir -p "${mountpt}" 2>/dev/null
|
||||||
mount ${options} "${devname}" "${mountpt}" >/dev/null 2>&1
|
mount ${options} "${devname}" "${mountpt}" >/dev/null 2>&1
|
||||||
|
|
||||||
fstype=$(awk '{ if ($1=="${devname}") { print $3" "$4;q }}' /proc/mounts)
|
fstype=$(awk '{ if ($1=="${devname}") { print $3" "$4;q }}' /proc/mounts)
|
||||||
fstype="${fstype%%,*}"
|
fstype="${fstype%%,*}"
|
||||||
case "${fstype%% *}" in
|
case "${fstype%% *}" in
|
||||||
*fat*|ntfs|*dos) options="user,exec,uid=0,gid=100,umask=00070" ;;
|
*fat*|ntfs|*dos) options="user,exec,uid=0,gid=100,umask=00070" ;;
|
||||||
*) options="users,defaults,exec" ;;
|
*) options="users,defaults,exec" ;;
|
||||||
#TODO handle 'sync' on usb devices...
|
#TODO handle 'sync' on usb devices...
|
||||||
esac
|
esac
|
||||||
|
|
||||||
echo "${devname} ${mountpt} ${fstype} ${options} 0 0 #configured by archiso" >>/etc/fstab
|
echo "${devname} ${mountpt} ${fstype} ${options} 0 0 #configured by archiso" >>/etc/fstab
|
||||||
done
|
done
|
||||||
stat_done
|
stat_done
|
||||||
}
|
}
|
||||||
|
|
||||||
scan_swap ()
|
scan_swap ()
|
||||||
{
|
{
|
||||||
#Archie finds a pagefile.sys for windows/dos machines... may add later
|
#Archie finds a pagefile.sys for windows/dos machines... may add later
|
||||||
stat_busy "Finding existing swap partitions"
|
stat_busy "Finding existing swap partitions"
|
||||||
swapdev="$(fdisk -l 2>/dev/null | grep swap | cut -d' ' -f1)"
|
swapdev="$(fdisk -l 2>/dev/null | grep swap | cut -d' ' -f1)"
|
||||||
if [ -e "${swapdev}" ]; then
|
if [ -e "${swapdev}" ]; then
|
||||||
swapon ${swapdev}
|
swapon ${swapdev}
|
||||||
echo "${swapdev} swap swap defaults 0 0 #configured by archiso" >>/etc/fstab
|
echo "${swapdev} swap swap defaults 0 0 #configured by archiso" >>/etc/fstab
|
||||||
fi
|
fi
|
||||||
stat_done
|
stat_done
|
||||||
}
|
}
|
||||||
|
|
||||||
do_homedir ()
|
do_homedir ()
|
||||||
{
|
{
|
||||||
stat_busy "Scanning for existing HOME directory"
|
stat_busy "Scanning for existing HOME directory"
|
||||||
user="$(cmdline_param homeuser)"
|
user="$(cmdline_param homeuser)"
|
||||||
for hdir in $(find /mnt -name "home/${user}" 2>/dev/null); do
|
for hdir in $(find /mnt -name "home/${user}" 2>/dev/null); do
|
||||||
mkdir -p "/home/arch/"
|
mkdir -p "/home/arch/"
|
||||||
# break after the first success...
|
# break after the first success...
|
||||||
mount --bind "${hdir}" "/home/arch/" && break
|
mount --bind "${hdir}" "/home/arch/" && break
|
||||||
done
|
done
|
||||||
stat_done
|
stat_done
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
root::99999::::::
|
root::99999::::::
|
||||||
bin:x:0::::::
|
bin:x:0::::::
|
||||||
daemon:x:0::::::
|
daemon:x:0::::::
|
||||||
mail:x:0::::::
|
mail:x:0::::::
|
||||||
ftp:x:0::::::
|
ftp:x:0::::::
|
||||||
nobody:x:0::::::
|
nobody:x:0::::::
|
||||||
arch::12922:0:99999:7:::
|
arch::12922:0:99999:7:::
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
root ALL=(ALL) ALL
|
root ALL=(ALL) ALL
|
||||||
%wheel localhost=(ALL) NOPASSWD: ALL
|
%wheel localhost=(ALL) NOPASSWD: ALL
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user