From c88eb6c686a74edf06234f181596212fa160653c Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sat, 16 Apr 2011 15:34:46 +0100 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Magiea. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r908 | blino | 2011-04-16 15:34:46 +0100 (Sat, 16 Apr 2011) | 1 line initial bootsplash import (cleaned from Mdv) ------------------------------------------------------------------------ --- Makefile | 5 +- README | 6 +- scripts/make-boot-splash | 4 +- scripts/make-boot-splash-raw | 2 +- scripts/remove-theme | 8 - scripts/switch-themes | 3 +- tmp/cmdline | 1 - tmp/lilo.conf | 42 --- tmp/menu.lst | 26 -- tmp/mkinitrd | 599 ------------------------------------------- 10 files changed, 8 insertions(+), 688 deletions(-) delete mode 100644 tmp/cmdline delete mode 100644 tmp/lilo.conf delete mode 100644 tmp/menu.lst delete mode 100644 tmp/mkinitrd diff --git a/Makefile b/Makefile index a16d269..a96730a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME=bootsplash -VERSION := 3.3.4 +VERSION := 3.3.5 SUBDIRS=scripts FILES=$(SUBDIRS) Makefile ChangeLog README @@ -9,9 +9,6 @@ sharedir=/usr/share configdir=/etc RPM=$(HOME)/rpm -SVNSOFT=svn+ssh://svn.mandriva.com/svn/soft/bootsplash/ -SVNNAME=svn+ssh://svn.mandriva.com/svn/packages/cooker/bootsplash/current/ - all: @for i in $(SUBDIRS);do make -C $$i all || exit 1 ;done diff --git a/README b/README index 98a7f8f..4331abc 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ Bootsplash ========== -This the Bootsplash package for Mandrake 8.2. +This the Bootsplash package for Mageia. The images are stored in initrd and loaded by the kernel at the initrd loading. @@ -22,7 +22,7 @@ SPLASH=auto # Choose the themes. The should be based in # /usr/share/bootsplash/themes/ -THEME=Mandrake +THEME=Mageia-Default # Say yes here if you want to leave the logo on the console. # Three options : @@ -52,7 +52,7 @@ LILO boot images ================ Lilo boot image are generated with the bmp2mdk script that can be found -in Mandrake Linux lilo package. +in lilo package. The command to generate the message file looks like: diff --git a/scripts/make-boot-splash b/scripts/make-boot-splash index 3173a7a..f4d5dab 100755 --- a/scripts/make-boot-splash +++ b/scripts/make-boot-splash @@ -3,12 +3,12 @@ # Copyright (C) 2002 by Chmouel Boudjnah # Redistribution of this file is permitted under the terms of the GNU # Public License (GPL) -# $Id$ +# $Id: make-boot-splash 261558 2009-10-07 17:07:28Z fcrozat $ : ${splash_dir=/usr/share/bootsplash} [[ -f /etc/sysconfig/bootsplash ]] && source /etc/sysconfig/bootsplash -[[ -z $THEME ]] && THEME=Mandriva +[[ -z $THEME ]] && THEME=Mageia-Default [ $# = 2 ] || { echo "usage: $0 "; exit 1; } diff --git a/scripts/make-boot-splash-raw b/scripts/make-boot-splash-raw index 2b3c034..f55f830 100755 --- a/scripts/make-boot-splash-raw +++ b/scripts/make-boot-splash-raw @@ -3,7 +3,7 @@ # Copyright (C) 2002 by Chmouel Boudjnah # Redistribution of this file is permitted under the terms of the GNU # Public License (GPL) -# $Id$ +# $Id: make-boot-splash-raw 263874 2009-11-30 18:28:33Z pterjan $ : ${splash_dir=/usr/share/bootsplash} diff --git a/scripts/remove-theme b/scripts/remove-theme index 7bfe9e5..90e1682 100644 --- a/scripts/remove-theme +++ b/scripts/remove-theme @@ -13,7 +13,6 @@ function get_current_theme () { [[ $opt != THEME=* ]] && continue theme=${opt##*=} done < $sysconfig - #[[ -z $theme ]] && theme="Mandriva" echo $theme } @@ -47,13 +46,6 @@ function update_boot () { } theme_to_remove=$1 -if [ "$theme_to_remove" = Mandrakelinux ]; then - # in case we are upgrading mandrakelinux-theme to mandriva-theme - # "remove-theme Mandrakelinux" will be called thinking there is no theme anymore - grep -qi "THEME=Mandriva" $sysconfig && exit 0 -fi - - current_theme=$(get_current_theme) if [ -z "$theme_to_remove" -o "$theme_to_remove" = "$current_theme" ]; then echo Removing $current_theme theme diff --git a/scripts/switch-themes b/scripts/switch-themes index b5b709f..9f8b6c3 100755 --- a/scripts/switch-themes +++ b/scripts/switch-themes @@ -3,7 +3,7 @@ # Copyright (C) 2002 by Chmouel Boudjnah # Redistribution of this file is permitted under the terms of the GNU # Public License (GPL) -# $Id$ +# $Id: switch-themes 261681 2009-10-12 10:16:06Z fcrozat $ plymouthdir=/usr/share/plymouth sysconfig=/etc/sysconfig/bootsplash @@ -23,7 +23,6 @@ function get_current_theme () { [[ $opt != THEME=* ]] && continue theme=${opt##*=} done < $sysconfig - #[[ -z $theme ]] && theme="Mandriva" echo $theme } diff --git a/tmp/cmdline b/tmp/cmdline deleted file mode 100644 index 6eb5a5f..0000000 --- a/tmp/cmdline +++ /dev/null @@ -1 +0,0 @@ -root=/dev/sda1 devfs=mount vga=0x0317 diff --git a/tmp/lilo.conf b/tmp/lilo.conf deleted file mode 100644 index 6ffbe38..0000000 --- a/tmp/lilo.conf +++ /dev/null @@ -1,42 +0,0 @@ -boot=/dev/sda -map=/boot/map -install=/boot/boot.b -vga=normal -default=t -keytable=/boot/fr-latin1.klt -lba32 -prompt -timeout=50 -message=/boot/message -menu-scheme=wb:bw:wb:bw -image=/boot/vmlinuz-enterprise - label=linux - root=/dev/sda1 - initrd=/boot/initrd-enterprise.img - append=" devfs=mount" - vga=788 - read-only -image=/boot/vmlinuz - label=linux-up - root=/dev/sda1 - initrd=/boot/initrd.img - append=" devfs=mount" - read-only -image=/boot/vmlinuz - label=failsafe - root=/dev/sda1 - initrd=/boot/initrd.img - append=" devfs=mount failsafe" - read-only -other=/dev/fd0 - label=floppy - unsafe - -image=/boot/vmlinuz-2.4.17-8mdksmp - label=t - root=/dev/sda1 - read-only - optional - vga=790 - append=" devfs=mount" - initrd=/boot/initrd-2.4.17-8mdksmp.img diff --git a/tmp/menu.lst b/tmp/menu.lst deleted file mode 100644 index 6ad67fc..0000000 --- a/tmp/menu.lst +++ /dev/null @@ -1,26 +0,0 @@ -timeout 5 -color black/cyan yellow/cyan -i18n (hd0,0)/boot/grub/messages -keytable (hd0,0)/boot/fr-latin1.klt -altconfigfile (hd0,0)/boot/grub/menu.once -default 0 - -title linux -kernel (hd0,0)/boot/vmlinuz-enterprise root=/dev/sda1 devfs=mount vga=787 -initrd (hd0,0)/boot/initrd-enterprise.img - -title failsafe -kernel (hd0,0)/boot/vmlinuz root=/dev/sda1 devfs=mount failsafe -initrd (hd0,0)/boot/initrd.img - -title floppy -root (fd0) -chainloader +1 - -title 2417-5smp -kernel (hd0,0)/boot/vmlinuz-2.4.17-5mdksmp devfs=mount root=/dev/sda1 -initrd (hd0,0)/boot/initrd-2.4.17-5mdksmp.img - -title 2417-5ent -kernel (hd0,0)/boot/vmlinuz-2.4.17-5mdkenterprise devfs=mount root=/dev/sda1 -initrd (hd0,0)/boot/initrd-2.4.17-5mdkenterprise.img diff --git a/tmp/mkinitrd b/tmp/mkinitrd deleted file mode 100644 index 1ad487f..0000000 --- a/tmp/mkinitrd +++ /dev/null @@ -1,599 +0,0 @@ -#!/bin/bash - -# mkinitrd -# -# Written by Erik Troan -# -# Contributors: -# Elliot Lee -# Miguel de Icaza -# Christian 'Dr. Disk' Hechelmann -# Michael K. Johnson -# Pierre Habraken -# Jakub Jelinek -# Carlo Arenas Belon (carenas@chasqui.lared.net.pe> -# Keith Owens -# Bernhard Rosenkraenzer -# Matt Wilson -# -# Patched for Mandrake by Guillaume Cottenceau -# - -PATH=/sbin:$PATH -export PATH - -VERSION=3.1.6-mdk - -compress=1 -target="" -kernel="" -force="" -verbose="" -MODULES="" -img_vers="" -modulefile=/etc/modules.conf -tmpdir= - -splash_dir=/usr/share/bootsplash/ -splash=auto -theme=Mandrake - -IMAGESIZE=100 -PRESCSIMODS="scsi_mod sd_mod unknown" -fstab="/etc/fstab" -IGNOREMODS="$IGNOREMODS ppa imm ide-scsi ext2 usb-storage" - -[[ -f /etc/sysconfig/bootsplash ]] && source /etc/sysconfig/bootsplash -[[ -n $SPLASH ]] && splash=$SPLASH -[[ -n $THEME ]] && theme=$THEME - -usage () { - echo "usage: `basename $0` [--version] [-v] [-f] [--ifneeded] [--preload ]" >&2 - echo " [--omit-scsi-modules] [--omit-raid-modules] [--splash=[auto|resolution] [--with=]" >&2 - echo " [--image-version] [--fstab=] [--nocompress] [--tmpdir=]" >&2 - echo " " >&2 - echo " (ex: `basename $0` /boot/initrd-$(uname -r).img $(uname -r))" >&2 - exit 1 -} - -findmodule() { - skiperrors="" - modName=$1 - if [ $(echo $modName | cut -b1) = "-" ]; then - skiperrors=1 - modName=$(echo $modName | cut -b2-) - fi - - if [ "$modName" = "i2o_block" ]; then - findmodule i2o_pci - findmodule i2o_core - modName="i2o_block" - fi - - if [ "$modName" = "pluto" ]; then - findmodule fc4 - findmodule soc - modName="pluto" - fi - - if [ "$modName" = "fcal" ]; then - findmodule fc4 - findmodule socal - modName="fcal" - fi - - if [ "$modName" = "xfs" ]; then - if [ -n "$skiperrors" ]; then - findmodule -pagebuf - else - findmodule pagebuf - fi - findmodule xfs_support - if [ -n "$skiperrors" ]; then - findmodule -xfs_dmapi - else - findmodule xfs_dmapi - fi - modName="xfs" - fi - - if [ "$modName" = "ext3" ]; then - if [ -n "$skiperrors" ]; then - findmodule -jbd - else - findmodule jbd - fi - modName="ext3" - fi - - for i in $IGNOREMODS; do - [ "$i" = "$modName" ] && return - done - - fmPath=`(cd /lib/modules/$kernel; find -type f -name $modName.o | grep -v build)` - - if [ -n "$fmPath" ]; then - # only need to add each module once - if echo $MODULES | grep $fmPath >/dev/null 2>&1 ; then : ; else - MODULES="$MODULES $fmPath" - fi - else - fmPath=`(cd /lib/modules/$kernel; find -type f -name $modName.o.gz | grep -v build)` - - if [ -n "$fmPath" ]; then - # only need to add each module once - if echo $MODULES | grep $fmPath >/dev/null 2>&1 ; then : ; else - zfmPath=`echo $fmPath | sed s/\.gz//` - MODULES="$MODULES $zfmPath" - fi - fi - fi - - if [ -z "$fmPath" ]; then - if [ -n "$skiperrors" ]; then - return - fi - - # ignore the absence of the scsi modules - for n in $PRESCSIMODS; do - if [ "$n" = "$modName" ]; then - return; - fi - done; - - echo "No module $modName found for kernel $kernel" >&2 - exit 1 - fi - -} - -is_good_fs() { - local parttype= tmpname= - local dir=$1 - [[ -d $dir ]] || return 1 - [[ -w $dir ]] || return 1 - [[ $dir == */ ]] && dir=${dir%/} - parttype=$(awk "{if (\$2 == \""$dir"\") print \$3 }" /proc/mounts) - - while tmpname=${dir%/*} && [[ -z $parttype ]];do - [[ -z $tmpname ]] && tmpname=/ - parttype=$(awk "{if (\$2 == \""$tmpname"\") print \$3 }" /proc/mounts) - dir=$tmpname - done - - case $parttype in - nfs|tmpfs) return 1;; - *) return 0; - esac - -} - -inst() { - if [ "$#" != "2" ];then - echo "usage: inst " - return - fi - [ -n "$verbose" ] && echo "$1 -> $2" - cp $1 $2 -} - -is_ix86() { - if [ -n "`uname -m | grep i.86`" ]; then return 0; fi - return 1 -} - -is_ppc() { - if [ -n "`uname -m | grep ppc`" ]; then return 0; fi - return 1 -} - -while [ $# -gt 0 ]; do - case $1 in - --fstab*) - if echo $1 | grep '=' >/dev/null ; then - fstab=`echo $1 | sed 's/^--fstab=//'` - else - fstab=$2 - shift - fi - ;; - - --tmpdir*) - if echo $1 | grep '=' >/dev/null ; then - tmpdir=`echo $1 | sed 's/^--tmpdir=//'` - else - tmpdir=$2 - shift - fi - ;; - --with*) - if echo $1 | grep '=' >/dev/null ; then - modname=`echo $1 | sed 's/^--with=//'` - else - modname=$2 - shift - fi - - basicmodules="$basicmodules $modname" - ;; - - --version) - echo "mkinitrd: version $VERSION" - exit 0 - ;; - - -v) - verbose=-v - ;; - - --nocompress) - compress="" - ;; - - --ifneeded) - ifneeded=1 - ;; - - -f) - force=1 - ;; - --preload) - if echo $1 | grep '=' >/dev/null ; then - modname=`echo $1 | sed 's/^--preload=//'` - else - modname=$2 - shift - fi - PREMODS="$PREMODS $modname" - ;; - --omit-scsi-modules) - PRESCSIMODS="" - noscsi=1; - ;; - --omit-raid-modules) - noraid=1; - ;; - --image-version) - img_vers=yes - ;; - --splash) - if echo $1 | grep '=' >/dev/null ; then - splash=`echo $1 | sed 's/^--splash=//'` - else - splash=$2 - shift - fi - [[ $splash == no ]] && splash= - ;; - *) - if [ -z "$target" ]; then - target=$1 - elif [ -z "$kernel" ]; then - kernel=$1 - else - usage - fi - ;; - esac - - shift -done - -if [[ $splash == auto && -f $splash_dir/scripts/detect-resolution ]];then - splash=$( $splash_dir/scripts/detect-resolution ) -fi - -if [ -z "$target" -o -z "$kernel" ]; then - usage -fi - -if [ -n "$img_vers" ]; then - target="$target-$kernel" -fi - -if [ -z "$force" -a -f $target ]; then - echo "$target already exists." >&2 - exit 1 -fi - -if [ ! -d /lib/modules/$kernel ]; then - echo "/lib/modules/$kernel is not a directory." >&2 - exit 1 -fi - -for n in $PREMODS; do - findmodule $n -done - -if [ -z "$noscsi" ]; then - if [ ! -f $modulefile ]; then - modulefile=/etc/conf.modules - fi - - if [ -f $modulefile ]; then - scsimodules=`grep -E "alias[ ]+scsi_hostadapter" $modulefile | grep -v '^[ ]*#' | LC_ALL=C sort -u | awk '{ print $3 }'` - # support probeall form as found with Mandrake 8.1 and superior - scsimodules="$scsimodules `sed -n 's/^ *probeall *scsi_hostadapter//p' $modulefile`" - - if [ -n "$scsimodules" ]; then - SAVEMODULES=$MODULES - - for n in $PRESCSIMODS; do - findmodule $n - done - - SAVEMODULESCMP=$MODULES - - for n in $(for m in $scsimodules; do echo $m; done | awk 'a[$1]=="" {print;a[$1]=1}'); do - # for now allow scsi modules to come from anywhere. There are some - # RAID controllers with drivers in block/ - findmodule $n - done - - [ "$SAVEMODULESCMP" = "$MODULES" ] && MODULES=$SAVEMODULES - fi - fi -fi - -# If we have ide devices and module ide, do the right thing -ide=/proc/ide/ide* -if [ -n "$ide" ]; then - findmodule -ide-mod - findmodule -ide-probe-mod - findmodule -ide-disk -fi - -if [ -z "$noraid" ]; then - # load appropriate raid devices if necessary, this means that the - # /etc/raidtab *must* be up to date for raided root to work. - #if grep '^/dev/md' $fstab | grep -v noauto >/dev/null 2>&1 ; then - for number in $(grep '^[ ]*raid-level' /etc/raidtab 2>/dev/null | - awk '{print $2}' | LC_ALL=C sort -u) ; do - case $number in - [014]) - findmodule raid$number - startraid=1 - ;; - 5) - findmodule -xor - findmodule raid$number - startraid=1 - ;; - *) - echo "raid level $number (in /etc/raidtab) not recognized" >&2 - ;; - esac - done - #fi -fi - - -# check to see if we need to set up a loopback filesystem -fullloopfile=$(awk '$2 == "/" && $4 ~ "loop" { print $1 }' /etc/fstab) -if [ -n "$fullloopfile" ]; then - dir=$fullloopfile - while [ -n "$dir" -a -z "$line" ]; do - dir=$(dirname $dir) - line=$(awk -v dir=$dir '$2 == dir { print $0 }' /etc/fstab) - done - if [ -z "$line" -o "$dir" = "/" ]; then - echo "bad fstab, loopback file doesn't belong to any device" - exit 1 - fi - loopDev=$(echo $line | awk '{ print $1 }') - loopFs=$(echo $line | awk '{print $3 }') - loopFile=$(echo $fullloopfile | sed "s|$dir||") - - basicmodules="$basicmodules -loop" - if [ "$loopFs" = "vfat" -o "$loopFs" = "msdos" ]; then - basicmodules="$basicmodules -fat" - fi - basicmodules="$basicmodules -${loopFs}" - -fi - -rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab) -rootfsopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/" && $6) { print $4; }}' $fstab | sed "s|defaults||;s|auto||;s|loop||;s|,,|,|;s|,$||;s|^,||") - -# in case the root filesystem is modular -findmodule -${rootfs} - -if [ "$rootfs" = "ext3" ] && echo $kernel | grep -q "^2\.2"; then - echo "Mandrake 2.2 kernels don't have ext3 compiled in, falling back to ext2 for you." - rootfs=ext2 -fi - -for n in $basicmodules; do - findmodule $n -done - -[[ -d $splash_dir/scripts ]] || splash= - -if [ "$rootfs" != "ext3" -a -z "$rootfsopts" -a -n "$ifneeded" -a -z "$MODULES" -a -z "$splash" ]; then - if [ -n "$verbose" ]; then - echo "Rootfs is not ext3, there is no rootfs special options, and" - echo "no modules are needed -- not building initrd image." - fi - exit 0 -fi - -if [ -n "$verbose" ]; then - echo "Using modules: $MODULES" -fi - -[[ -n $tmpdir ]] && { is_good_fs $tmpdir || tmpdir= ;} #command-line -[[ -z $tmpdir && -n $TMPDIR ]] && { is_good_fs $TMPDIR || tmpdir= && tmpdir=$TMPDIR ;} #environement -if [[ -z $tmpdir ]];then - if is_good_fs /tmp;then - tmpdir=/tmp - elif is_good_fs /var/tmp;then - tmpdir=/var/tmp - elif is_good_fs /root/tmp;then - tmpdir=/root/tmp - else - echo "Cannot use a tmp directory" >&2 - exit 1 - fi -fi -[[ -n $verbose ]] && echo "Using $tmpdir as temporary directory." - -MNTIMAGE=`mktemp -d ${tmpdir}/initrd.XXXXXX` -IMAGE=`mktemp ${tmpdir}/initrd.img.XXXXXX` -MNTPOINT=`mktemp -d ${tmpdir}/initrd.mnt.XXXXXX` -RCFILE=$MNTIMAGE/linuxrc -# cleanup on exit, hangup, interrupt, quit, termination -trap 'rm -rf $MNTIMAGE $MNTPOINT $IMAGE' 0 1 2 3 15 - -if [ -z "$MNTIMAGE" -o -z "$IMAGE" -o -z "$MNTPOINT" ]; then - echo "Error creating temporaries. Try again" >&2 - exit 1 -fi - -mkdir -p $MNTIMAGE -mkdir -p $MNTIMAGE/lib -mkdir -p $MNTIMAGE/bin -mkdir -p $MNTIMAGE/etc -mkdir -p $MNTIMAGE/dev -mkdir -p $MNTIMAGE/loopfs -mkdir -p $MNTIMAGE/proc -mkdir -p $MNTIMAGE/sysroot -ln -s bin $MNTIMAGE/sbin -# devfs will shadow some of my dev entries, I'll put them here -mkdir -p $MNTIMAGE/safedev - -# We don't need this directory, so let's save space -rm -rf $MNTPOINT/lost+found - -inst /sbin/nash "$MNTIMAGE/bin/nash" -if is_ix86; then - inst /sbin/insmod-DIET "$MNTIMAGE/bin/insmod" -else - inst /sbin/insmod.static "$MNTIMAGE/bin/insmod" -fi -ln -s ../bin/nash $MNTIMAGE/sbin/modprobe - -for MODULE in $MODULES; do - f="/lib/modules/$kernel/$MODULE" - if [ -e $f ]; then - cp $verbose -a $f $MNTIMAGE/lib - else - gunzip -c $f.gz > $MNTIMAGE/lib/`basename $MODULE` - fi -done - -# mknod'ing the devices instead of copying them works both with and -# without devfs... -mknod $MNTIMAGE/dev/console c 5 1 -mknod $MNTIMAGE/dev/null c 1 3 -mknod $MNTIMAGE/dev/ram b 1 1 -mknod $MNTIMAGE/dev/systty c 4 0 -for i in 1 2 3 4; do - mknod $MNTIMAGE/dev/tty$i c 4 $i -done - -echo "#!/bin/nash" > $RCFILE -echo "" >> $RCFILE - -for MODULE in $MODULES; do - module=`echo $MODULE | sed "s|.*/||" | sed "s/.o$//"` - - options=`sed -n -e "s/^options[ ][ ]*$module[ ][ ]*//p" $modulefile 2>/dev/null` - - if [ -n "$verbose" ]; then - echo "Loading module $module with options $options" - fi - echo "echo \"Loading $module module\"" >> $RCFILE - echo "insmod /lib/$module.o $options" >> $RCFILE -done - -echo "echo Mounting /proc filesystem" >> $RCFILE -echo "mount -t proc /proc /proc" >> $RCFILE - -if [ -n "$loopDev" ]; then - [ -d /initrd ] || mkdir /initrd - - # our dear friend devfsd will create links for us if devfs in use - cp -aL $loopDev $MNTIMAGE/safedev - cp -aL /dev/loop7 $MNTIMAGE/safedev - - loopDev=`echo $loopDev | sed "s|/dev/|/safedev/|"` - - echo "echo Mounting device containing loopback root filesystem" >> $RCFILE - echo "mount -t $loopFs $loopDev /loopfs" >> $RCFILE - echo "echo Setting up loopback device on $loopFile" >> $RCFILE - echo "losetup /safedev/loop7 /loopfs$loopFile" >> $RCFILE - rootdev=/safedev/loop7 -else - echo "echo Creating root device" >> $RCFILE - echo "mkrootdev /dev/root" >> $RCFILE - rootdev=/dev/root -fi - -if [ -n "$startraid" ]; then - cp -aL /dev/md0 $MNTIMAGE/safedev - echo "raidautorun /safedev/md0" >> $RCFILE -fi - -if echo $kernel | grep -q "^2\.2"; then -if is_ppc; then -[ -n "$loopDev" ] && echo "echo 0x07070000 > /proc/sys/kernel/real-root-dev" >> $RCFILE -else -[ -n "$loopDev" ] && echo "echo 0x0707 > /proc/sys/kernel/real-root-dev" >> $RCFILE -fi -echo "umount /proc" >> $RCFILE - -else -# Linux-2.4 -echo "echo 0x0100 > /proc/sys/kernel/real-root-dev" >> $RCFILE -echo "umount /proc" >> $RCFILE - -[ -n "$rootfsopts" ] && rootfsopts_msg="with flags $rootfsopts" -echo "echo Mounting root filesystem $rootfsopts_msg" >> $RCFILE -echo "mount --ro -t $rootfs $rootdev /sysroot $rootfsopts" >> $RCFILE -echo "pivot_root /sysroot /sysroot/initrd" >> $RCFILE -echo "echo Remounting devfs at correct place if necessary" >> $RCFILE -echo "handledevfs" >> $RCFILE -fi - -chmod +x $RCFILE - - -for i in `ls -sk $MNTIMAGE/*/* | sed 's/ [^ ]*$//'`; do - IMAGESIZE=$[IMAGESIZE + $i] -done -NB_INODES=20 -for i in `find $MNTIMAGE`; do NB_INODES=$[NB_INODES + 1]; done -IMAGESIZE=$[IMAGESIZE + NBFILES / 10] # 10 inodes needs 1k - -dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null - -if [ -n "$verbose" ]; then - echo "Contents of RCFILE:" - cat $RCFILE 2> /dev/null - echo "Creating filesystem with size ${IMAGESIZE}KB and $NB_INODES inodes" -fi -mke2fs -q -m 0 -F -N $NB_INODES -s 1 $IMAGE - -mkdir -p $MNTPOINT -mount -t ext2 $IMAGE $MNTPOINT -o loop || { - echo "Can't get a loopback device" - exit 1 -} - -# We don't need this directory, so let's save space -rm -rf $MNTPOINT/lost+found - - -(cd $MNTIMAGE; tar cf - .) | (cd $MNTPOINT; tar xf -) - -umount $MNTPOINT - -if [ -n "$compress" ]; then - gzip -9 < $IMAGE > $target -else - cp -a $IMAGE $target -fi - -if [[ -n "$splash" && -f $splash_dir/scripts/make-boot-splash ]];then - $splash_dir/scripts/make-boot-splash $target $splash -fi -- cgit v1.2.1