root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

'upgpgk: bump to new archboot 0.4.18'

Browse source
This commit is contained in:
Tobias Powalowski 2007-07-29 12:22:28 +00:00
parent 470d6c18fc
commit fb29ace5c2
10 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
archbootcd.conf
View file

@ -27,13 +27,14 @@ ISOLINUXCFG="/etc/archboot/etc/isolinux.cfg"
MENULST="/etc/archboot/etc/menu.lst" MENULST="/etc/archboot/etc/menu.lst"
# Prompt on CD boot, defaulted to yes, 1=yes 0=no # Prompt on CD boot, defaulted to yes, 1=yes 0=no
PROMPT="1" PROMPT="0"
# Name of the ISO, if empty Arch Linux is used if not set by a HOOK later # Name of the ISO, if empty Arch Linux is used if not set by a HOOK later
ISONAME="" ISONAME=""
# Timeout in seconds on CD boot, defaulted to 0, because we prompt by default # Timeout in seconds on CD boot, defaulted to 30 to fix usb keyboard issues
TIMEOUT="0" # 0 means wait for prompt
TIMEOUT="30"
# Setting cdrecord options # Setting cdrecord options
DEVICE="/dev/cdrw" DEVICE="/dev/cdrw"

1
etc/inittab
View file

@ -13,6 +13,7 @@ id:2:initdefault:
rc::sysinit:/etc/rc.sysinit rc::sysinit:/etc/rc.sysinit
rh:06:wait:/etc/rc.shutdown rh:06:wait:/etc/rc.shutdown
c0:2:respawn:/sbin/agetty -n -l /etc/login.sh 9600 ttyS0 linux
c1:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/1 linux c1:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/1 linux
c2:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/2 linux c2:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/2 linux
c3:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/3 linux c3:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/3 linux

2
etc/profile
View file

@ -9,7 +9,7 @@ export INPUTRC="/etc/inputrc"
export LESS="-R" export LESS="-R"
# Locale settings (find your locale with 'locale -a') # Locale settings (find your locale with 'locale -a')
export LANG="en_EN" export LANG="C"
export LC_COLLATE="C" export LC_COLLATE="C"
export COLUMNS LINES export COLUMNS LINES

1
etc/securetty
View file

@ -7,5 +7,6 @@ vc/1
vc/2 vc/2
vc/3 vc/3
vc/4 vc/4
ttyS0
# End of file # End of file

36
etc/udev.rules
View file

@ -310,28 +310,29 @@ SUBSYSTEM=="usb_device", ACTION=="add", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev
# persistent storage links: /dev/{disk,tape}/{by-id,by-uuid,by-label,by-path,by-name} # persistent storage links: /dev/{disk,tape}/{by-id,by-uuid,by-label,by-path,by-name}
# scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare@suse.de> # scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare@suse.de>
# do not change that !!! # needed like this!!!
ACTION!="add|change", GOTO="persistent_storage_end" ACTION!="add|change", GOTO="persistent_storage_end"
KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode" KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst" KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
# type 8 devices are "Medium Changers" # type 8 devices are "Medium Changers"
KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode" KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}" KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
SUBSYSTEM!="block", GOTO="persistent_storage_end" SUBSYSTEM!="block", GOTO="persistent_storage_end"
# skip rules for inappropriate block devices # skip rules for inappropriate block devices
# do not add dm-* !!! # don't add dm-*!!!
KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|md*", GOTO="persistent_storage_end" KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|md*", GOTO="persistent_storage_end"
# never access non-cdrom removable ide devices, the drivers are causing event loops on open() # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end" KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end" KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end"
# ignore partitions that span the entire disk
ATTR{whole_disk}=="", GOTO="persistent_storage_end"
# for partitions import parent information # for partitions import parent information
KERNEL=="*[0-9]", IMPORT{parent}="ID_*" KERNEL=="*[0-9]", IMPORT{parent}="ID_*"
@ -341,11 +342,11 @@ KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODE
KERNEL=="hd*[0-9]", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n" KERNEL=="hd*[0-9]", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_SUBSYSTEMS}="ieee1394" KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_SUBSYSTEMS}="ieee1394"
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x" KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id --export"
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode" KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode" KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss"
KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}" KERNEL=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
KERNEL=="sd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}-part%n" KERNEL=="sd*[0-9]|cciss*p[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
# libata compat (links like hd*) # libata compat (links like hd*)
KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="/lib/udev/ata_id $tempnode", ENV{ID_ATA_COMPAT}="$result" KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="/lib/udev/ata_id $tempnode", ENV{ID_ATA_COMPAT}="$result"
@ -356,16 +357,16 @@ KERNEL=="mmcblk[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr
KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n" KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n"
# by-path (shortest physical path) # by-path (shortest physical path)
KERNEL=="*[!0-9]|sr*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}" KERNEL=="*[!0-9]|sr*|cciss?c[0-9]d[0-9]", IMPORT{program}="path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
KERNEL=="*[0-9]|cciss*p[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
KERNEL=="st*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}" KERNEL=="st*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}"
KERNEL=="sr*|st*", GOTO="persistent_storage_end" KERNEL=="sr*|st*", GOTO="persistent_storage_end"
KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
# by-label/by-uuid (filesystem properties) # by-label/by-uuid (filesystem properties)
KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end" KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
IMPORT{program}="/lib/udev/vol_id --export $tempnode" IMPORT{program}="/lib/udev/vol_id --export $tempnode"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}" ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}" ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
# BIOS Enhanced Disk Device # BIOS Enhanced Disk Device
KERNEL=="*[!0-9]", IMPORT{program}="/lib/udev/edd_id --export $tempnode" KERNEL=="*[!0-9]", IMPORT{program}="/lib/udev/edd_id --export $tempnode"
@ -381,9 +382,8 @@ ACTION!="add|change", GOTO="md_end"
ATTR{md/array_state}=="|clear|inactive", GOTO="md_end" ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
IMPORT{program}="/lib/udev/vol_id --export $tempnode" IMPORT{program}="/lib/udev/vol_id --export $tempnode"
OPTIONS="link_priority=100" OPTIONS="link_priority=100"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}" ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}" ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
LABEL="md_end" LABEL="md_end"
# Persistant block device stuff - end # Persistant block device stuff - end
##################################### #####################################

5
hooks/arch-filesystems
View file

@ -1,5 +1,10 @@
run_hook () run_hook ()
{ {
# fix ext2/ext3 symlinks
ln -s /sbin/e2fsck /sbin/fsck.ext3
ln -s /sbin/mkfs.ext2 /sbin/mke2fs
ln -s /sbin/findfs /sbin/tune2fs
# fix vfat symlink # fix vfat symlink
ln -s /sbin/mkdosfs /sbin/mkfs.vfat ln -s /sbin/mkdosfs /sbin/mkfs.vfat
ln -s /sbin/mkdosfs /sbin/mkfs.msdos ln -s /sbin/mkdosfs /sbin/mkfs.msdos

3
install/arch-base
View file

@ -29,7 +29,8 @@ install ()
### adding needed programs from running system ### adding needed programs from running system
add_file "${CONFIG}" "/config" add_file "${CONFIG}" "/config"
SCRIPT="arch-base" SCRIPT="arch-base"
BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vim lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip" BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vim lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget"
add_file "/bin/echo"
add_file "/bin/gunzip" add_file "/bin/gunzip"
add_file "/bin/zcat" add_file "/bin/zcat"
add_file "/usr/bin/reset" add_file "/usr/bin/reset"

3
install/arch-bootmessage
View file

@ -7,7 +7,8 @@ install ()
[ "${RUNPROGRAM}" = "mkbootcd-grub" ] && TITLEMSG="GRUB" [ "${RUNPROGRAM}" = "mkbootcd-grub" ] && TITLEMSG="GRUB"
[ "${RUNPROGRAM}" = "mksyslinux" ] && TITLEMSG="SYSLINUX" [ "${RUNPROGRAM}" = "mksyslinux" ] && TITLEMSG="SYSLINUX"
[ "${RUNPROGRAM}" = "mkpxelinux" ] && TITLEMSG="PXELINUX" [ "${RUNPROGRAM}" = "mkpxelinux" ] && TITLEMSG="PXELINUX"
# change to english locale!
export LANG=en_US
CONFIGMSG="INSTALLATION / RESCUEBOOT SYSTEM" CONFIGMSG="INSTALLATION / RESCUEBOOT SYSTEM"
if ! [ "${LOCALSETUP}" = "yes" ]; then if ! [ "${LOCALSETUP}" = "yes" ]; then
CVSMSG=$(mktemp /tmp/archmsg.XXXX) CVSMSG=$(mktemp /tmp/archmsg.XXXX)

4
install/arch-filesystems
View file

@ -2,8 +2,8 @@
install () install ()
{ {
MODULES=" $(checked_modules '/kernel/fs' | grep -v "nls") $(checked_modules '/kernel/fs/nls/nls_cp437') " MODULES=" $(checked_modules '/kernel/fs' "
BINARIES="mkswap mke2fs mkreiserfs reiserfsck reiserfstune resize_reiserfs mkfs.ext2 badblocks blkid dumpe2fs e2fsck e2image e2label findfs fsck logsave resize2fs tune2fs mkfs.ext3 mkfs.xfs mkntfs ntfscat ntfsclone ntfscluster ntfsfix ntfsinfo ntfslabel ntfsls ntfsresize ntfsundelete mkfs.jfs fsck.jfs jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune fsck.ext2 fsck.ext3 fsck.xfs xfs_repair xfs_check xfs_freeze xfs_io xfs_admin xfs_db mkdosfs dosfsck ntfs-3g" BINARIES="mkswap debugreiserfs mkreiserfs fsck.reiserfs reiserfstune resize_reiserfs mke2fs badblocks blkid debugfs dumpe2fs fsck.ext2 e2image e2label fsck logsave resize2fs mkfs.ext3 mkfs.ntfs mount.ntfs-fuse ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls mkfs.jfs fsck.jfs jfs_debugfs jfs_fscklog jfs_logdump jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck ntfs-3g"
FILES="" FILES=""
SCRIPT="arch-filesystems" SCRIPT="arch-filesystems"
} }

8
install/arch-remote
View file

@ -4,7 +4,7 @@ install ()
{ {
MODULES=" $(checked_modules "/drivers/net/") " MODULES=" $(checked_modules "/drivers/net/") "
BINARIES="$(basename $(find /usr/bin/screen-*)) telnet tcpd ssh scp ssh-keygen sshd pmap_set pmap_dump portmap xinetd in.telnetd rsync" BINARIES="$(basename $(find /usr/bin/screen-*)) telnet tcpd findssl.sh scp sftp slogin ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd pmap_set pmap_dump portmap xinetd in.telnetd rsync"
FILES="" FILES=""
SCRIPT="arch-remote" SCRIPT="arch-remote"
add_file "/etc/archboot/etc/remote/hosts.allow" "/etc/hosts.allow" add_file "/etc/archboot/etc/remote/hosts.allow" "/etc/hosts.allow"
@ -21,7 +21,11 @@ install ()
add_file "/etc/archboot/etc/remote/screen_pam" "/etc/pam.d/screen" add_file "/etc/archboot/etc/remote/screen_pam" "/etc/pam.d/screen"
add_file "/etc/archboot/etc/remote/rsyncd.conf" "/etc/rsyncd.conf" add_file "/etc/archboot/etc/remote/rsyncd.conf" "/etc/rsyncd.conf"
add_file "/etc/archboot/etc/remote/rsync_xinetd" "/etc/xinet.d/rsync" add_file "/etc/archboot/etc/remote/rsync_xinetd" "/etc/xinet.d/rsync"
add_file "/usr/share/terminfo/x/xterm" for i in $(find /usr/share/terminfo/ ! -type d); do
add_file "$i"
done
add_file "/usr/lib/ssh/sftp-server"
add_file "/usr/lib/ssh/ssh-keysign"
add_file "/etc/rc.d/portmap" add_file "/etc/rc.d/portmap"
add_file "/etc/rc.d/sshd" add_file "/etc/rc.d/sshd"
add_file "/etc/rc.d/xinetd" add_file "/etc/rc.d/xinetd"