Commit 1f6d9b6f authored by Svenja's avatar Svenja

Merge branch 'master' of www.fsmpi.rwth-aachen.de:lip

parents cc763ff2 c3da1266
*acpi: acpi
*background_image: gfxterm
*cat: cat
*cpuid: cpuid
*crc: hashsum
*echo: echo
*functional_test: functional_test
*gettext: gettext
*hashsum: hashsum
*hdparm: hdparm
*hello: hello
*help: help
*hexdump: hexdump
*inb: iorw
*inl: iorw
*inw: iorw
*keystatus: keystatus
*kfreebsd: bsd
*knetbsd: bsd
*kopenbsd: bsd
*list_env: loadenv
*load_env: loadenv
*loopback: loopback
*ls: ls
*lsacpi: lsacpi
*lspci: lspci
*md5sum: hashsum
*menuentry: normal
*probe: probe
*read_byte: memrw
*read_dword: memrw
*read_word: memrw
*regexp: regexp
*save_env: loadenv
*search: search
*serial: serial
*setpci: setpci
*sha1sum: hashsum
*sha256sum: hashsum
*sha512sum: hashsum
*sleep: sleep
*submenu: normal
*terminfo: terminfo
*test_blockarg: test_blockarg
*xnu_splash: xnu
.: configfile
[: test
appleloader: appleldr
authenticate: normal
background_color: gfxterm
badram: mmap
blocklist: blocklist
boot: boot
break: normal
cat: minicmd
chainloader: chain
clear: normal
cmp: cmp
configfile: configfile
continue: normal
cutmem: mmap
date: date
dump: minicmd
exit: minicmd
export: normal
extract_entries_configfile: configfile
extract_entries_source: configfile
fakebios: loadbios
false: true
fix_video: fixvideo
gptsync: gptsync
halt: halt
help: minicmd
initrd: linux
keymap: keylayouts
kfreebsd_loadenv: bsd
kfreebsd_module: bsd
kfreebsd_module_elf: bsd
knetbsd_module: bsd
knetbsd_module_elf: bsd
kopenbsd_ramdisk: bsd
linux: linux
loadbios: loadbios
loadfont: font
lsefimmap: lsefimmap
lsefisystab: lsefisystab
lsfonts: font
lsmmap: lsmmap
lsmod: minicmd
lssal: lssal
module2: multiboot2
module: multiboot
multiboot2: multiboot2
multiboot: multiboot
normal: normal
normal_exit: normal
outb: iorw
outl: iorw
outw: iorw
parttool: parttool
password: password
password_pbkdf2: password_pbkdf2
play: play
read: read
reboot: reboot
return: normal
rmmod: minicmd
search.file: search_fs_file
search.fs_label: search_label
search.fs_uuid: search_fs_uuid
setparams: normal
shift: normal
source: configfile
terminal_input: terminal
terminal_output: terminal
test: test
testload: testload
true: true
usb: usbtest
videoinfo: videoinfo
videotest: videotest
write_byte: memrw
write_dword: memrw
write_word: memrw
xnu_devprop_load: xnu
xnu_kernel64: xnu
xnu_kernel: xnu
xnu_kext: xnu
xnu_kextdir: xnu
xnu_mkext: xnu
xnu_ramdisk: xnu
xnu_resume: xnu
xnu_uuid: xnu_uuid
zfs-bootfs: zfsinfo
zfsinfo: zfsinfo
RIJNDAEL: gcry_rijndael
RIJNDAEL192: gcry_rijndael
RIJNDAEL256: gcry_rijndael
AES128: gcry_rijndael
AES-128: gcry_rijndael
AES-192: gcry_rijndael
AES-256: gcry_rijndael
ADLER32: adler32
TIGER192: gcry_tiger
RIPEMD160: gcry_rmd160
CAST5: gcry_cast5
RFC2268_40: gcry_rfc2268
DES: gcry_des
3DES: gcry_des
SERPENT128: gcry_serpent
SERPENT192: gcry_serpent
SERPENT256: gcry_serpent
AES: gcry_rijndael
AES192: gcry_rijndael
AES256: gcry_rijndael
MD5: gcry_md5
CAMELLIA128: gcry_camellia
CAMELLIA192: gcry_camellia
CAMELLIA256: gcry_camellia
SHA512: gcry_sha512
SHA384: gcry_sha512
SHA1: gcry_sha1
SEED: gcry_seed
ARCFOUR: gcry_arcfour
SHA224: gcry_sha256
SHA256: gcry_sha256
TWOFISH: gcry_twofish
TWOFISH128: gcry_twofish
CRC32: gcry_crc
CRC32RFC1510: gcry_crc
CRC24RFC2440: gcry_crc
MD4: gcry_md4
WHIRLPOOL: gcry_whirlpool
BLOWFISH: gcry_blowfish
affs
afs
afs_be
befs
befs_be
btrfs
cpio
ext2
fat
hfs
hfsplus
iso9660
jfs
minix
minix2
nilfs2
ntfs
reiserfs
sfs
squash4
tar
udf
ufs1
ufs2
xfs
zfs
set iso32="lipws1213-i386.iso"
set iso64="lipws1213-amd64.iso"
function set64 {
set iso=${iso64}
set bits="64"
set altbits="32"
}
function set32 {
set iso=${iso32}
set bits="32"
set altbits="64"
}
function guesscpu {
if cpuid -l
then
echo "Dein System scheint ein 64-bit System zu sein."
set64
else
echo "Dein System scheint ein 32-bit System zu sein."
set32
fi
echo "Die weiseste Wahl sollte $bits bits mit $iso und $isoinitrd zu sein"
echo
}
#elif is not working in this grub version !?!
if test -z $bits
then
guesscpu
else
if test 64 == $bits
then
set64
else
set32
fi
fi
# Set up a loop device and start a Debian style Casper Live CD from it.
function LoadCasperLoop {
if test -z "${isodev}"
then
search -f -s isodev /${iso}
echo "Found ${iso} on (${isodev})"
echo ""
fi
loopback loop (${isodev})/${iso}
echo "Loading kernel (takes up to 2 minutes)"
echo ""
echo "Hint: You may need to mount the USB stick on /isodevice by hand !"
echo " Or you may need to run this:"
echo " . /scripts/casper-helpers"
echo " find_cow_device ${iso}"
linux (loop)/casper/vmlinuz boot=casper iso-scan/filename=/$iso file=/cdrom/preseed/ubuntu.seed ${localeinfo} nosplash verbose --
echo "Loading initrd from iso (takes up to 5 minutes)"
initrd (loop)/casper/initrd.lz
echo "Starting kernel"
}
menuentry "Empfohlen: Ubuntu 12.04 LTS ${bits}bit (deutsch)" {
set localeinfo="debian-installer/locale=de_DE console-setup/layoutcode=de"
LoadCasperLoop
}
menuentry "Empfohlen: Ubuntu 12.04 LTS ${bits}bit (english)" {
set localeinfo=""
LoadCasperLoop
}
menuentry "========================= Helfermenu ===============================" {
echo "hier ist nichts"
}
menuentry "Ubuntu 12.04 AMD64 LIP WS1213 Custom" {
set iso=${iso64}
set localeinfo=""
LoadCasperLoop
}
menuentry "Ubuntu 12.04 AMD64 LIP WS1213 Custom DE" {
set iso=${iso64}
set localeinfo="debian-installer/locale=de_DE console-setup/layoutcode=de"
LoadCasperLoop
}
menuentry "Ubuntu 12.04 i386 LIP WS1213 Custom" {
set iso=${iso32}
set localeinfo=""
LoadCasperLoop
}
menuentry "Ubuntu 12.04 i386 LIP WS1213 Custom DE" {
set iso=${iso32}
set localeinfo="debian-installer/locale=de_DE console-setup/layoutcode=de"
LoadCasperLoop
}
# GRUB Environment Block
recordfail=1
##########################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
\ No newline at end of file
squash4: gzio fshelp
search_fs_uuid:
lssal:
date: datetime normal
uhci: pci usb
multiboot2: boot video acpi relocator mmap
gcry_twofish: crypto
gcry_rijndael: crypto
echo: extcmd
cpio:
xzio: gcry_crc
part_sun:
gcry_sha512: crypto
gcry_cast5: crypto
efi_gop: video video_fb
boot:
ls: extcmd normal
gzio:
video:
test_blockarg: extcmd normal
gfxterm: video extcmd bitmap_scale bitmap font
gcry_tiger: crypto
gcry_serpent: crypto
aout:
gcry_blowfish: crypto
appleldr: boot
trig:
extcmd:
at_keyboard: boot keylayouts
videoinfo: video
minix:
keylayouts:
xnu_uuid: gcry_md5
usbtest: usb
usbms: usb scsi
reboot:
help: extcmd normal
part_msdos:
blocklist:
probe: extcmd
pbkdf2: crypto
lsefisystab:
gcry_rfc2268: crypto
gcry_camellia: crypto
fat:
pci:
parttool: normal
lzopio: crypto
linux: boot video relocator mmap
gcry_md4: crypto
zfsinfo: zfs
usb_keyboard: keylayouts usb
gcry_md5: crypto
fshelp:
datetime:
bitmap_scale: bitmap
ata: pci scsi
usbserial_common: usb serial
gcry_des: crypto
reiserfs: fshelp
dm_nv: raid
datehook: datetime normal
afs_be: fshelp
kernel:
video_cirrus: video pci video_fb
gcry_seed: crypto
crypto:
test:
terminal:
lsacpi: extcmd acpi
jpeg: bufio bitmap
bsd: boot video aout extcmd cpuid elf relocator serial mmap
memdisk:
gfxmenu: video gfxterm trig bitmap_scale bitmap normal font
cmp:
acpi: extcmd mmap
xfs: fshelp
elf:
cpuid: extcmd
affs: fshelp
usb: pci
videotest: video gfxmenu font
testload:
relocator: mmap
play:
adler32: crypto
password: crypto normal
part_sunpc:
video_fb: video
sleep: extcmd normal
serial: extcmd terminfo
search_fs_file:
gcry_sha256: crypto
gcry_rmd160: crypto
search: search_fs_uuid extcmd search_fs_file search_label
mdraid09: raid
chain: boot
memrw: extcmd
cs5536: pci
ata_pthru: ata
password_pbkdf2: gcry_sha512 pbkdf2 crypto normal
mdraid1x: raid
gcry_crc: crypto
configfile: normal
befs: fshelp
raid5rec: raid
gcry_arcfour: crypto
gettext:
hello: extcmd
usbserial_pl2303: usbserial_common usb serial
hashsum: extcmd crypto normal
regexp: extcmd normal
part_gpt:
ohci: boot pci usb cs5536
gptsync:
zfs: gzio
part_apple:
hdparm: extcmd
bufio:
btrfs: gzio lzopio
bitmap:
true:
terminfo: extcmd
ntfscomp: ntfs
hfs:
ufs1:
setjmp:
ufs2:
nilfs2: fshelp
lsmmap: mmap
gcry_sha1: crypto
mmap:
befs_be: fshelp
tar:
png: bufio bitmap
lspci: extcmd pci
hfsplus: fshelp
tga: bufio bitmap
minix2: