From 51510c2d9adedefb25c42ddd051a258e99f8e7fb Mon Sep 17 00:00:00 2001 From: Benjamin Schieder Date: Tue, 18 Oct 2005 14:37:46 +0000 Subject: [PATCH] Benjamin Schieder: updated target LVP (0.5.0) [2005100818180409998] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6497 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/lvp/ChangeLog | 6 + target/lvp/build.sh | 26 ++- target/lvp/config.in | 6 +- target/lvp/kernel26.conf | 160 +++++++++++++----- target/lvp/parse-config | 2 +- target/lvp/pkg_xorg.conf | 4 +- target/lvp/x86/build.sh | 4 +- target/lvp/x86/help0.txt | 2 +- target/lvp/x86/initrd/hardware | 25 +-- target/lvp/x86/initrd/kernel | 6 +- target/lvp/x86/initrd/linuxrc | 10 +- target/lvp/x86/initrd/linuxrc2 | 2 + .../x86/livesystem/etc_lvp_10-encryption.sh | 35 ++-- target/lvp/x86/livesystem/linuxrc | 2 - target/lvp/x86/release_skeleton/config.sh | 3 + .../release_skeleton/scripts/configuration | 1 - .../x86/release_skeleton/scripts/encrypted | 43 ++--- 17 files changed, 191 insertions(+), 146 deletions(-) diff --git a/target/lvp/ChangeLog b/target/lvp/ChangeLog index 11c52e16c..1e8205c58 100644 --- a/target/lvp/ChangeLog +++ b/target/lvp/ChangeLog @@ -1,4 +1,10 @@ +Sat Oct 8 17:13:24 CEST 2005 Benjamin Schieder + + * usual ROCK update + * now uses devicemapper instead of loop-aes + * V0.5.0: released, dubbed "backwards incompatible" + Fri Feb 25 19:50:36 CET 2005 Benjamin Schieder * usual ROCK update diff --git a/target/lvp/build.sh b/target/lvp/build.sh index 7c3fc589e..fa6b7a442 100644 --- a/target/lvp/build.sh +++ b/target/lvp/build.sh @@ -1,5 +1,5 @@ -lvp_ver="0.4.4-dev" +lvp_ver="0.5.0" rootdir="${base}/build/${ROCKCFG_ID}" ROCKdir="${rootdir}/ROCK" releasedir="${ROCKdir}/lvp_${lvp_ver}_${ROCKCFG_X86_OPT}" @@ -32,7 +32,12 @@ else echo_status "Creating directory structure" mkdir -p ${releasedir}/initrd cd ${releasedir}/initrd - mkdir -p bin etc proc dev tmp mnt + mkdir -p bin etc proc dev tmp mnt sys + mknod dev/ram0 b 1 0 + mknod dev/null c 1 3 + mknod dev/zero c 1 5 + mknod dev/tty c 5 0 + mknod dev/console c 5 1 ln -sf bin sbin ln -sf . usr cd etc @@ -51,16 +56,18 @@ else bin/mount \ bin/umount \ bin/rm \ - usr/bin/chroot \ bin/find \ bin/gawk \ bin/loadkeys \ + etc/udev \ lib/modules/${kernelversion}-rock \ sbin/agetty \ sbin/hwscan \ sbin/rmmod \ sbin/modprobe \ sbin/insmod \ + sbin/udevstart \ + usr/bin/chroot \ usr/bin/eject \ usr/bin/lsmod \ usr/sbin/lspci \ @@ -70,7 +77,7 @@ else mkdir -p ${x%/*} cp -ar ${rootdir}/${x} ${x} - chmod u-s,g-s ${x} + chmod u-s,g-s,u+w ${x} dynamic=`file ${x} | grep -c dynamic` if [ "${dynamic}" != "0" ] ; then echo_error "WARNING! ${x} is NOT linked statically!" @@ -82,6 +89,7 @@ else chmod +x * ln -sf gzip gunzip ln -sf gzip gzcat + ln -sf bash sh cd .. mv bin/linuxrc . @@ -116,7 +124,7 @@ else bin/umount \ etc/mplayer/mplayer.conf \ usr/share/mplayer/font-arial-24-iso-8859-1 \ - usr/X11/bin/XFree86 \ + usr/X11/bin/Xorg \ usr/X11/bin/X \ usr/X11/bin/startx \ usr/X11/bin/xauth \ @@ -125,15 +133,19 @@ else usr/X11/lib/X11/fonts/misc \ usr/bin/lvp \ usr/bin/mplayer \ + usr/bin/md5sum \ usr/bin/tail \ usr/sbin/lspci \ + sbin/blockdev \ + sbin/dmsetup \ sbin/losetup \ - sbin/mdadm + sbin/mdadm \ + sbin/udevstart do mkdir -p ${x%/*} cp -ar ${rootdir}/${x} ${x} - chmod u-s,g-s ${x} + chmod u-s,g-s,u+w ${x} dynamic=`file ${x} | grep -c dynamic` if [ "${dynamic}" != "0" ] ; then echo_error "WARNING! ${x} is NOT linked statically!" diff --git a/target/lvp/config.in b/target/lvp/config.in index 9b6a1418d..67b764aa7 100644 --- a/target/lvp/config.in +++ b/target/lvp/config.in @@ -32,8 +32,8 @@ pkgfilter sed ' / binutils / { p; d; }; / bison / { p; d; }; / bzip2 / { p; d; }; -/ ciphers / { p; d; }; / coreutils / { p; d; }; +/ device-mapper / { p; d; }; / diffutils / { p; d; }; / ed / { p; d; }; / eject / { p; d; }; @@ -59,7 +59,6 @@ pkgfilter sed ' / libtool / { p; d; }; / libungif / { p; d; }; / linux / { p; d; }; -/ loop-aes / { p ; d; }; / lvp / { p; d; }; / m4 / { p; d; }; / make / { p; d; }; @@ -79,11 +78,12 @@ pkgfilter sed ' / tar / { p; d; }; / termcap / { p; d; }; / texinfo / { p; d; }; +/ udev / { p; d; }; / ucl / { p; d; }; / upx / { p; d; }; / util-linux / { p; d; }; / w32codec / { p; d; }; -/ xfree86 / { p; d; }; +/ xorg / { p; d; }; / zlib / { p; d; }; # Disable all other packages /.*/ { s/^X /O /p; d; };' diff --git a/target/lvp/kernel26.conf b/target/lvp/kernel26.conf index 71a7754a7..2d810efef 100644 --- a/target/lvp/kernel26.conf +++ b/target/lvp/kernel26.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10 -# Tue Feb 22 16:03:06 2005 +# Linux kernel version: 2.6.12.3-rock +# Sat Oct 8 14:56:37 2005 # CONFIG_X86=y CONFIG_MMU=y @@ -15,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y CONFIG_EXPERIMENTAL=y CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup @@ -26,12 +27,14 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set -CONFIG_LOG_BUF_SHIFT=16 CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -41,6 +44,7 @@ CONFIG_CC_ALIGN_LABELS=0 CONFIG_CC_ALIGN_LOOPS=0 CONFIG_CC_ALIGN_JUMPS=0 CONFIG_TINY_SHMEM=y +CONFIG_BASE_SMALL=0 # # Loadable module support @@ -82,6 +86,7 @@ CONFIG_M686=y # CONFIG_MWINCHIPC6 is not set # CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set # CONFIG_X86_GENERIC is not set @@ -89,6 +94,7 @@ CONFIG_X86_CMPXCHG=y CONFIG_X86_XADD=y CONFIG_X86_L1_CACHE_SHIFT=5 CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_X86_PPRO_FENCE=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y @@ -104,6 +110,7 @@ CONFIG_X86_TSC=y # CONFIG_X86_MCE is not set # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set +# CONFIG_X86_REBOOTFIXUPS is not set # CONFIG_MICROCODE is not set # CONFIG_X86_MSR is not set # CONFIG_X86_CPUID is not set @@ -117,7 +124,9 @@ CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM64G is not set # CONFIG_MATH_EMULATION is not set # CONFIG_MTRR is not set +# CONFIG_EFI is not set # CONFIG_REGPARM is not set +# CONFIG_SECCOMP is not set # # Power management options (ACPI, APM) @@ -127,8 +136,27 @@ CONFIG_NOHIGHMEM=y # # ACPI (Advanced Configuration and Power Interface) Support # -# CONFIG_ACPI is not set +CONFIG_ACPI=y +CONFIG_ACPI_BOOT=y +CONFIG_ACPI_INTERPRETER=y +# CONFIG_ACPI_AC is not set +# CONFIG_ACPI_BATTERY is not set +# CONFIG_ACPI_BUTTON is not set +# CONFIG_ACPI_VIDEO is not set +# CONFIG_ACPI_FAN is not set +# CONFIG_ACPI_PROCESSOR is not set +# CONFIG_ACPI_ASUS is not set +# CONFIG_ACPI_IBM is not set +# CONFIG_ACPI_TOSHIBA is not set CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_BUS=y +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_PCI=y +CONFIG_ACPI_SYSTEM=y +# CONFIG_X86_PM_TIMER is not set +# CONFIG_ACPI_CONTAINER is not set # # CPU Frequency scaling @@ -145,8 +173,12 @@ CONFIG_PCI=y CONFIG_PCI_GOANY=y CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +# CONFIG_PCIEPORTBUS is not set CONFIG_PCI_LEGACY_PROC=y CONFIG_PCI_NAMES=y +# CONFIG_PCI_DEBUG is not set +CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set # CONFIG_SCx200 is not set @@ -156,10 +188,6 @@ CONFIG_PCI_NAMES=y # # CONFIG_PCCARD is not set -# -# PC-card bridges -# - # # PCI Hotplug Support # @@ -197,6 +225,7 @@ CONFIG_FW_LOADER=m # # Plug and Play support # +# CONFIG_PNP is not set # # Block devices @@ -206,9 +235,9 @@ CONFIG_BLK_DEV_FD=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_AES=y -CONFIG_BLK_DEV_LOOP_KEYSCRUB=y +CONFIG_BLK_DEV_CRYPTOLOOP=m # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set CONFIG_BLK_DEV_RAM=y @@ -226,6 +255,7 @@ CONFIG_IOSCHED_NOOP=y # CONFIG_IOSCHED_AS is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set +# CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support @@ -239,6 +269,7 @@ CONFIG_BLK_DEV_IDE=y # CONFIG_BLK_DEV_IDE_SATA is not set # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_IDEDISK is not set +CONFIG_IDEDISK_MULTI_MODE=y CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set @@ -283,7 +314,8 @@ CONFIG_BLK_DEV_SR=y # SCSI Transport Attributes # # CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m # # SCSI low-level drivers @@ -302,7 +334,6 @@ CONFIG_BLK_DEV_SR=y # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_EATA_PIO is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_GDTH is not set # CONFIG_SCSI_IPS is not set @@ -310,7 +341,6 @@ CONFIG_BLK_DEV_SR=y # CONFIG_SCSI_INIA100 is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_QLOGIC_ISP is not set # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set CONFIG_SCSI_QLA2XXX=y @@ -319,7 +349,7 @@ CONFIG_SCSI_QLA2XXX=y # CONFIG_SCSI_QLA2300 is not set # CONFIG_SCSI_QLA2322 is not set # CONFIG_SCSI_QLA6312 is not set -# CONFIG_SCSI_QLA6322 is not set +CONFIG_SCSI_LPFC=m # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set @@ -338,7 +368,12 @@ CONFIG_MD_LINEAR=y # CONFIG_MD_RAID6 is not set # CONFIG_MD_MULTIPATH is not set # CONFIG_MD_FAULTY is not set -# CONFIG_BLK_DEV_DM is not set +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set # # Fusion MPT device support @@ -364,7 +399,6 @@ CONFIG_NET=y # Networking options # # CONFIG_PACKET is not set -# CONFIG_NETLINK_DEV is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set # CONFIG_INET is not set @@ -426,18 +460,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_EVDEV is not set # CONFIG_INPUT_EVBUG is not set -# -# Input I/O drivers -# -# CONFIG_GAMEPORT is not set -CONFIG_SOUND_GAMEPORT=y -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -# CONFIG_SERIO_SERPORT is not set -# CONFIG_SERIO_CT82C710 is not set -# CONFIG_SERIO_PCIPS2 is not set -# CONFIG_SERIO_RAW is not set - # # Input Device Drivers # @@ -455,6 +477,18 @@ CONFIG_MOUSE_PS2=y # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + # # Character devices # @@ -468,6 +502,7 @@ CONFIG_HW_CONSOLE=y # CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_ACPI is not set CONFIG_SERIAL_8250_NR_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set @@ -475,6 +510,7 @@ CONFIG_SERIAL_8250_NR_UARTS=4 # Non-8250 serial port support # CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_JSM=m CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -504,8 +540,14 @@ CONFIG_RTC=y # CONFIG_DRM is not set # CONFIG_MWAVE is not set # CONFIG_RAW_DRIVER is not set +# CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + # # I2C support # @@ -624,13 +666,9 @@ CONFIG_SOUND_AD1980=m # # USB support # -# CONFIG_USB is not set CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information -# +# CONFIG_USB is not set # # USB Gadget Support @@ -642,6 +680,11 @@ CONFIG_USB_ARCH_HAS_OHCI=y # # CONFIG_MMC is not set +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + # # File systems # @@ -652,11 +695,15 @@ CONFIG_EXT2_FS=y # CONFIG_JBD is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set + +# +# XFS support +# # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_QUOTA is not set -CONFIG_DNOTIFY=y +# CONFIG_DNOTIFY is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set @@ -666,8 +713,7 @@ CONFIG_DNOTIFY=y CONFIG_ISO9660_FS=y CONFIG_JOLIET=y # CONFIG_ZISOFS is not set -CONFIG_UDF_FS=y -CONFIG_UDF_NLS=y +# CONFIG_UDF_FS is not set # # DOS/FAT/NT Filesystems @@ -681,10 +727,8 @@ CONFIG_UDF_NLS=y # CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y -# CONFIG_SYSFS is not set -CONFIG_DEVFS_FS=y -CONFIG_DEVFS_MOUNT=y -# CONFIG_DEVFS_DEBUG is not set +CONFIG_SYSFS=y +# CONFIG_DEVFS_FS is not set CONFIG_DEVPTS_FS_XATTR=y # CONFIG_DEVPTS_FS_SECURITY is not set CONFIG_TMPFS=y @@ -713,7 +757,6 @@ CONFIG_RAMFS=y # # Network File Systems # -# CONFIG_EXPORTFS is not set # # Partition Types @@ -773,14 +816,18 @@ CONFIG_NLS_ISO8859_1=y # # Kernel hacking # +# CONFIG_PRINTK_TIME is not set CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y +CONFIG_LOG_BUF_SHIFT=16 # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set # CONFIG_FRAME_POINTER is not set # CONFIG_EARLY_PRINTK is not set # CONFIG_DEBUG_STACKOVERFLOW is not set @@ -798,7 +845,36 @@ CONFIG_MAGIC_SYSRQ=y # # Cryptographic options # -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=y +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_AES_586=m +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# +# CONFIG_CRYPTO_DEV_PADLOCK is not set # # Library routines diff --git a/target/lvp/parse-config b/target/lvp/parse-config index 21853c169..d98d21242 100644 --- a/target/lvp/parse-config +++ b/target/lvp/parse-config @@ -22,7 +22,7 @@ static=0 -for x in upx gzip sed kbd mplayer pciutils grep coreutils libgli lvp gawk findutils eject xfree86 flex module-init-tools strace gdb ; do +for x in xorg udev device-mapper upx gzip sed kbd mplayer pciutils grep coreutils libgli lvp gawk findutils eject xfree86 flex module-init-tools strace gdb ; do [ "${pkg}" == "${x}" ] && static=1 done diff --git a/target/lvp/pkg_xorg.conf b/target/lvp/pkg_xorg.conf index d417f42aa..8ed8b5ec1 100644 --- a/target/lvp/pkg_xorg.conf +++ b/target/lvp/pkg_xorg.conf @@ -8,13 +8,13 @@ xf_config() { if pkginstalled expat ; then cat >> config/cf/host.def << EOT /* Disable the internal expat library to use the system installed one */ -#define HasExpat YES +#define HasExpat NO EOT fi cat >> config/cf/host.def << EOT /* Disable the internal zlib to use the system installed one */ -#define HasZlib YES +#define HasZlib NO /* Less warnings with recent gccs ... */ #define DefaultCCOptions -ansi GccWarningOptions diff --git a/target/lvp/x86/build.sh b/target/lvp/x86/build.sh index 4abc5a225..350e0e052 100644 --- a/target/lvp/x86/build.sh +++ b/target/lvp/x86/build.sh @@ -34,8 +34,8 @@ find ${releasedir} -name .svn -exec rm -rf {} \; 2>/dev/null echo_status "Extracting isolinux boot loader." mkdir -p isolinux tar --use-compress-program=bzip2 \ - -xf ${base}/download/mirror/s/syslinux-${syslinux_ver}.tar.bz2 \ - syslinux-${syslinux_ver}/isolinux.bin -O > ${releasedir}/isolinux/isolinux.bin + -O -xf ${base}/download/mirror/s/syslinux-${syslinux_ver}.tar.bz2 \ + syslinux-${syslinux_ver}/isolinux.bin > ${releasedir}/isolinux/isolinux.bin echo_status "Creating isolinux config file." cp ${base}/target/${target}/x86/isolinux.cfg ${releasedir}/isolinux/ diff --git a/target/lvp/x86/help0.txt b/target/lvp/x86/help0.txt index e53312ef9..3535989e9 100644 --- a/target/lvp/x86/help0.txt +++ b/target/lvp/x86/help0.txt @@ -5,7 +5,7 @@ | / /__| |/ / ____/ | | /_____/___/_/ | | [===================================================================] | -| V 0.4.4 "graphics galore" | +| V 0.5.0 "backwards incompatible" | | | | Kernel Images: | | lvp Start LVP | diff --git a/target/lvp/x86/initrd/hardware b/target/lvp/x86/initrd/hardware index bdabde691..d4f6f550f 100644 --- a/target/lvp/x86/initrd/hardware +++ b/target/lvp/x86/initrd/hardware @@ -1,29 +1,8 @@ #!/bin/bash -echo "Trying to autodetect hardware..." +echo "Running udevstart to get /dev started ... " -read a b version c < /proc/version -/bin/hwscan -k ${version} >/tmp/hardware - -if [ `grep -c '^# ' /tmp/hardware` -gt 0 ] ; then - echo 'Found the following:' - grep '^# ' /tmp/hardware | sed 's,^# ,- ,g' - echo 'Now trying to initialise them...' - . /tmp/hardware -fi - -# looks like hwscan just silently fails if something is missing -# for example it says it found 0 modules, while executing that -# find command brings up 400-odd files. We'll just load -# _everything_ in that case. -if [ ! -s /tmp/hardware ] ; then - echo "EEP! hwscan screwed up!" - echo -n "Trying emergency module loading ... " - for x in `find /lib/modules/ -name '*.ko'` ; do - insmod ${x} >/dev/null 2>&1 - done - echo "done" -fi +/sbin/udevstart if [ ! -e /dev/sound/dsp ] ; then echo 'EEP! We have no sound!' diff --git a/target/lvp/x86/initrd/kernel b/target/lvp/x86/initrd/kernel index bab4e355e..a3b50804e 100644 --- a/target/lvp/x86/initrd/kernel +++ b/target/lvp/x86/initrd/kernel @@ -1,5 +1,5 @@ #!/bin/bash -for x in /lib/modules/*/block/loop_* ; do - insmod ${x} >/dev/null 2>&1 -done +insmod /lib/modules/*/kernel/arch/i386/crypto/aes-i586.ko +insmod /lib/modules/*/kernel/drivers/md/dm-mod.ko +insmod /lib/modules/*/kernel/drivers/md/dm-crypt.ko diff --git a/target/lvp/x86/initrd/linuxrc b/target/lvp/x86/initrd/linuxrc index 1396ad369..8b0255bfe 100644 --- a/target/lvp/x86/initrd/linuxrc +++ b/target/lvp/x86/initrd/linuxrc @@ -2,6 +2,12 @@ mount -n -t proc proc /proc mount -n -t tmpfs tmpfs /tmp +mount -n -t ramfs devfs /dev +mount -n -t sysfs sys /sys + +/bin/keymap +/bin/hardware +/bin/kernel cd /dev ; rm -f fd ln -sf /proc/kcore core @@ -32,8 +38,4 @@ for x in ${ttydevs} ; do ( ( while : ; do agetty -i 38400 ${x} -n -l /bin/login-shell ; done ) & ) done -/bin/keymap -/bin/hardware -/bin/kernel - agetty -i 38400 vc/1 -n -l /bin/linuxrc2 diff --git a/target/lvp/x86/initrd/linuxrc2 b/target/lvp/x86/initrd/linuxrc2 index b99fd3aa0..8783e957a 100644 --- a/target/lvp/x86/initrd/linuxrc2 +++ b/target/lvp/x86/initrd/linuxrc2 @@ -61,7 +61,9 @@ while : ; do if [ ${s} -gt 0 -a ${s} -le ${num_found} ] ; then eval "x=\${choice_${s}}" mount -n ${x} /mnt + mount --bind /dev /mnt/dev chroot /mnt /linuxrc + umount /mnt/dev # man, this sucks # sometimes the livesystem's linuxrc seems to be unable to umount everything... for x in 1 2 3 4 5 6 7 8 9 0 ; do diff --git a/target/lvp/x86/livesystem/etc_lvp_10-encryption.sh b/target/lvp/x86/livesystem/etc_lvp_10-encryption.sh index 713a70121..5cd5ffa41 100644 --- a/target/lvp/x86/livesystem/etc_lvp_10-encryption.sh +++ b/target/lvp/x86/livesystem/etc_lvp_10-encryption.sh @@ -13,36 +13,22 @@ encryption_start() { echo echo "Starting crypto-subroutine" - echo "Please choose which encryption you want to use:" - echo -e "\t1\tblowfish" - echo -e "\t2\ttwofish" - echo -e "\t3\tserpent" - echo - unset thisenc - while [ -z "${thisenc}" ] ; do - read -p "Please enter your choice: " rthisenc - [ "${rthisenc}" == "1" ] && thisenc="blowfish256" - [ "${rthisenc}" == "2" ] && thisenc="twofish256" - [ "${rthisenc}" == "3" ] && thisenc="serpent256" - done - echo "Using ${thisenc%256} encryption." - exec 2>/dev/null + for x in /lvp.data* ; do + losetup /dev/loop/${x#/lvp.data} ${x} + done + mdadm --build /dev/md/0 -l linear --force -n ${numfiles} ${files} while [ ! -e /mnt1/lvp.xml ] ; do echo -n "Please enter passphrase: " - read -s passphrase + read -s pass echo - for x in /lvp.data* ; do - echo "${passphrase}" | losetup -e ${thisenc} -p 0 /dev/loop/${x#/lvp.data} ${x} - done - mdadm --build /dev/md/0 -l linear --force -n ${numfiles} ${files} - mount /dev/md/0 /mnt1 + pass="`echo ${pass} | md5sum`" + pass=${pass%% *} + echo 0 `/sbin/blockdev --getsize /dev/md/0` crypt aes-plain ${pass} 0 /dev/md/0 0 | /sbin/dmsetup create lvp_data + mount /dev/mapper/lvp_data /mnt1 if [ ! -e /mnt1/lvp.xml ] ; then echo "Wrong Passphrase!" - mdadm /dev/md/0 -S - for x in /lvp.data* ; do - losetup -d /dev/loop/${x#/lvp.data} - done + dmsetup remove /dev/mapper/lvp_data fi done exec 2>&1 @@ -51,6 +37,7 @@ encryption_start() { encryption_stop(){ umount /mnt1 + dmsetup remove /dev/mapper/lvp_data mdadm -S /dev/md/0 for x in /lvp.data* ; do losetup -d /dev/loop/${x#/lvp.data} diff --git a/target/lvp/x86/livesystem/linuxrc b/target/lvp/x86/livesystem/linuxrc index 2a5159972..5f8ea564e 100644 --- a/target/lvp/x86/livesystem/linuxrc +++ b/target/lvp/x86/livesystem/linuxrc @@ -2,7 +2,6 @@ mount -t proc none /proc mount -t tmpfs none /tmp -mount -t devfs none /dev mount -t devpts none /dev/pts cd /dev ; rm -f fd @@ -34,6 +33,5 @@ for x in /etc/lvp/*.sh ; do done umount /dev/pts -umount /dev umount /proc umount /tmp diff --git a/target/lvp/x86/release_skeleton/config.sh b/target/lvp/x86/release_skeleton/config.sh index 7347922bf..aa47bb1f9 100644 --- a/target/lvp/x86/release_skeleton/config.sh +++ b/target/lvp/x86/release_skeleton/config.sh @@ -24,12 +24,15 @@ while [ "${quit}" == "0" ] ; do c) save scripts/create_lvp + read -p "Press -- to continue" ;; x) scripts/cleanup + read -p "Press -- to continue" ;; i) scripts/create_iso + read -p "Press -- to continue" ;; *) get ${choice} diff --git a/target/lvp/x86/release_skeleton/scripts/configuration b/target/lvp/x86/release_skeleton/scripts/configuration index 7fdcb1ecc..d82b7b8c0 100644 --- a/target/lvp/x86/release_skeleton/scripts/configuration +++ b/target/lvp/x86/release_skeleton/scripts/configuration @@ -1,7 +1,6 @@ multi LVP_TYPE plain "How to store data on the LVP" plain encrypted if [ "${LVP_TYPE}" == "encrypted" ] ; then multi LVP_ENTROPY_SOURCE random "What device to use for creating the pseudo-filesystems" random urandom zero - multi LVP_ENCRYPTION blowfish "What encryption-algorhythm to use" blowfish twofish serpent fi multi LVP_SIZE dvd "What medium are you using" cd dvd other diff --git a/target/lvp/x86/release_skeleton/scripts/encrypted b/target/lvp/x86/release_skeleton/scripts/encrypted index b75efa06f..705b336fe 100644 --- a/target/lvp/x86/release_skeleton/scripts/encrypted +++ b/target/lvp/x86/release_skeleton/scripts/encrypted @@ -6,29 +6,6 @@ entrosource="${LVP_ENTROPY_SOURCE}" process_encrypted(){ target="livesystem" - for module in twofish blowfish serpent ; do - eval "encryption_${module}=0" - [ `lsmod | grep -c "loop_${module}"` -eq 0 ] && modprobe loop_${module} >/dev/null 2>&1 # fails for kernel >= 2.5.48 if module already loaded - [ `lsmod | grep -c "loop_${module}"` -eq 1 ] && eval "encryption_${module}=1" - done - - encryption_available=0 - [ ${encryption_twofish} -eq 1 -o ${encryption_blowfish} -eq 1 -o ${encryption_serpent} -eq 1 ] && \ - encryption_available=1 - - if [ ${encryption_available} -eq 0 ] ; then - echo "Sorry, you do not have loop-aes on your system. Please have a look at" - echo "http://loop-aes.sourceforge.net" - exit 1 - fi - - eval "avail=\${encryption_${LVP_ENCRYPTION}}" - if [ "${avail}" == "0" ] ; then - echo "Sorry, ${LVP_ENCRYPTION} is not available on your system." - echo "Please check your kernel configuration." - exit 1 - fi - echo "Loading kernel module for linear mode" grep -q linear /proc/mdstat || modprobe linear if ! grep -q linear /proc/mdstat ; then @@ -137,8 +114,6 @@ process_encrypted(){ rm -rf ${target}/mnt* mkdir ${target}/mnt1 - echo "Using ${LVP_ENCRYPTION} encryption." - echo "Now I need a passphrase for encrypting the filesystems." passphrase="MEEP" passphrase_confirm="MOOP" @@ -165,7 +140,7 @@ process_encrypted(){ file="${target}/lvp.data${lvpdata}" echo "Setting up loopdevice ${lvpdata}" - echo "${passphrase}" | losetup -p 0 -e ${LVP_ENCRYPTION}256 ${lodev} ${file} + losetup ${lodev} ${file} lvpdata=$(( ${lvpdata} + 1 )) done @@ -183,10 +158,15 @@ process_encrypted(){ done ${target}/sbin/mdadm --build ${mddev} -l linear --force -n ${needed_pseudofs} ${mdloopdevs} - echo "Creating filesystem on ${mddev}" - mkfs.ext2 -m 0 ${mddev} >/dev/null 2>&1 - echo "Mounting filesystem ${mddev}" - mount ${mddev} ${target}/mnt1 + passphrase="`echo ${passphrase} | md5sum`" + passphrase=${passphrase%% *} + + echo 0 `/sbin/blockdev --getsize ${mddev}` crypt aes-plain ${passphrase} 0 ${mddev} 0 | /sbin/dmsetup create lvp_data_$$ + + echo "Creating filesystem" + mkfs.ext2 -m 0 /dev/mapper/lvp_data_$$ >/dev/null 2>&1 + echo "Mounting filesystem" + mount /dev/mapper/lvp_data_$$ ${target}/mnt1 rm -rf ${target}/mnt1/* continue=0 @@ -219,8 +199,9 @@ process_encrypted(){ process_create_lvpxml echo "Umounting filesystem ${mddev}" - umount ${mddev} + umount livesystem/mnt1 echo "Shutting down ${mddev}" + dmsetup remove /dev/mapper/lvp_data_$$ mdadm -S ${mddev} lvpdata=${needed_pseudofs}