From 330345c2824b2e0d7e63cfe952af3e4a6cc2cd3b Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 18 Mar 2007 21:34:35 +0000 Subject: [PATCH] GD-Graph fuer Maniac eingebaut Kernel laedt ab jetzt keine Module mehr ungefragt. Nash aktualisiert um richtige Ramdisks zu erstellen (noch unstable). pppsetup.cgi vom Maniac eingefuegt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@450 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/kernel/kernel.config.i586 | 4 +- config/kernel/kernel.config.i586.smp | 2 +- config/rootfiles/common/GD-Graph | 27 + config/rootfiles/common/modutils | 4 +- doc/packages-list.txt | 1 + html/cgi-bin/pppsetup.cgi | 530 ++-- lfs/GD-Graph | 79 + lfs/initrd | 14 +- make.sh | 1 + src/install+setup/install/main.c | 45 +- src/install+setup/install/probecntrl.sh | 22 +- src/install+setup/install/unattended.c | 2 +- src/install+setup/install/usb.c | 3 +- src/nash/Makefile | 13 +- src/nash/linux_fs.h | 362 +-- src/nash/mkinitrd | 320 ++- src/nash/mount_by_label.c | 600 ++--- src/nash/mount_by_label.h | 4 +- src/nash/name_to_dev_t.c | 139 ++ src/nash/nash.8 | 27 +- src/nash/nash.c | 2942 +++++++++++++---------- 21 files changed, 2923 insertions(+), 2218 deletions(-) create mode 100644 config/rootfiles/common/GD-Graph create mode 100644 lfs/GD-Graph create mode 100644 src/nash/name_to_dev_t.c diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index 7a2916e5b0..2354e7e150 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.42-ipfire -# Fri Mar 16 12:03:27 2007 +# Sun Mar 18 16:54:28 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -66,7 +66,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y +# CONFIG_KMOD is not set # # Block layer diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index 3ef83905f9..06391324a6 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -67,7 +67,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y +# CONFIG_KMOD is not set CONFIG_STOP_MACHINE=y # diff --git a/config/rootfiles/common/GD-Graph b/config/rootfiles/common/GD-Graph new file mode 100644 index 0000000000..8c9a8d9bd7 --- /dev/null +++ b/config/rootfiles/common/GD-Graph @@ -0,0 +1,27 @@ +#usr/lib/perl5/site_perl/5.8.8/GD +#usr/lib/perl5/site_perl/5.8.8/GD/Graph +usr/lib/perl5/site_perl/5.8.8/GD/Graph.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/Data.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/Error.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/FAQ.pod +usr/lib/perl5/site_perl/5.8.8/GD/Graph/area.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/axestype.pm +#usr/lib/perl5/site_perl/5.8.8/GD/Graph/axestype.pm.orig +usr/lib/perl5/site_perl/5.8.8/GD/Graph/bars.pm +#usr/lib/perl5/site_perl/5.8.8/GD/Graph/bars.pm.orig +usr/lib/perl5/site_perl/5.8.8/GD/Graph/colour.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/hbars.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/lines.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/linespoints.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/mixed.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/pie.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/points.pm +usr/lib/perl5/site_perl/5.8.8/GD/Graph/utils.pm +#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/GD/Graph +#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/GD/Graph/.packlist +#usr/share/man/man3/GD::Graph.3 +#usr/share/man/man3/GD::Graph::Data.3 +#usr/share/man/man3/GD::Graph::Error.3 +#usr/share/man/man3/GD::Graph::FAQ.3 +#usr/share/man/man3/GD::Graph::colour.3 +#usr/share/man/man3/GD::Graph::hbars.3 diff --git a/config/rootfiles/common/modutils b/config/rootfiles/common/modutils index 4944e386d2..f6533340c1 100644 --- a/config/rootfiles/common/modutils +++ b/config/rootfiles/common/modutils @@ -1,8 +1,8 @@ bin/lsmod sbin/depmod -#sbin/generate-modprobe.conf +sbin/generate-modprobe.conf sbin/insmod -#sbin/insmod.static +sbin/insmod.static sbin/modinfo sbin/modprobe sbin/rmmod diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 05f96c49b6..9ec6e6508f 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -10,6 +10,7 @@ * Digest-HMAC-1.01 * Digest-SHA1-2.10 * GD-2.35 +* GDGraph-1.4308 * Geo-IP-PurePerl-1.17 * HTML-Parser-3.45 * HTML-Tagset-3.04 diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index aeaaf5c525..d81a4fe7a6 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -457,11 +457,10 @@ $checked{'DNS'}{'Manual'} = ''; $checked{'DNS'}{$pppsettings{'DNS'}} = "checked='checked'"; &Header::openpage($Lang::tr{'ppp setup'}, 1, ''); - &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { - &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + &Header::openbox('100%', 'center', $Lang::tr{'error messages'}); print "$errormessage\n"; print " \n"; &Header::closebox(); @@ -472,13 +471,13 @@ if ($errormessage) { ### Box for selecting profile ### print "
\n"; -&Header::openbox('100%', 'left', $Lang::tr{'profiles'}); +&Header::openbox('100%', 'center', $Lang::tr{'profile'}); print < + - - + - - - + + +
$Lang::tr{'profile'}: - $Lang::tr{'profile'} +
+

+
END ; + &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'connection'}.':'); +&Header::openbox('100%', 'center', $Lang::tr{'connection'}); + print < + - - + - + - + END ; if (-f "/proc/bus/usb/devices") { my $usb=`lsmod | cut -d ' ' -f1 | grep -E "hci"`; if ($usb eq '') { - print "\t\n"; + print "\t\n"; } else { - print "\t\n"; + print "\t\n"; } } if ($pppsettings{'TYPE'}) { - print "
$Lang::tr{'interface'}: - $Lang::tr{'interface'}: +
USB:USB:$Lang::tr{'not running'}
$Lang::tr{'not running'}
$usb
$usb
"; + print ""; if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/) { print < - - + + END ; } if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { print <$Lang::tr{'computer to modem rate'} - + + END ; - } else { - print "\n"; - } + } if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/ ) { - print "\n"; - print "\n"; + print "\n"; + print "\n"; if ($pppsettings{'TYPE'} eq 'modem' ) { - print "\n"; - print "\n"; - } else { - print "\n"; - } + print "\n"; + print "\n"; + } } } if ($pppsettings{'TYPE'} eq 'modem') { print < - - + - - + + + + END ; @@ -625,41 +625,46 @@ END print < - - - + + END ; if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && ( $netsettings{'RED_TYPE'} eq "DHCP" || $netsettings{'RED_TYPE'} eq "STATIC") ) { $pppsettings{'AUTOCONNECT'} = 'on'; - print "\n"; - print "\n"; + print "\n"; + print "\n"; } else { - print "\n"; - print "\n"; + print "\n"; + print "\n"; } print <$Lang::tr{'connection debugging'}: - - + + + + + + + - + - + + + + END ; if ($pppsettings{'TYPE'} ne 'isdn') { print < - - - + + + + + + + - - - - + + - - - - + + END ; if ($pppsettings{'TYPE'} eq 'isdn') { print < -


$Lang::tr{'interface'}:$Lang::tr{'interface'}:
$Lang::tr{'computer to modem rate'}
 
$Lang::tr{'number'}
$Lang::tr{'number'}
$Lang::tr{'modem speaker on'}
 
$Lang::tr{'modem speaker on'}
$Lang::tr{'dialing mode'}$Lang::tr{'dialing mode'}$Lang::tr{'send cr'}
$Lang::tr{'send cr'}
$Lang::tr{'idle timeout'} $Lang::tr{'idle timeout'}
$Lang::tr{'connect on ipfire restart'}
$Lang::tr{'connect on ipfire restart'}
$Lang::tr{'connect on ipfire restart'}
$Lang::tr{'connect on ipfire restart'}
$Lang::tr{'connection debugging'}:



$Lang::tr{'reconnection'}:		$Lang::tr{'reconnection'}:
- $Lang::tr{'manual'}$Lang::tr{'manual'}
$Lang::tr{'dod'}
- $Lang::tr{'persistent'}$Lang::tr{'backupprofile'}: -
$Lang::tr{'persistent'}
$Lang::tr{'backupprofile'}:$Lang::tr{'dod for dns'}
- $Lang::tr{'dod'}$Lang::tr{'dod for dns'}$Lang::tr{'holdoff'}:
$Lang::tr{'holdoff'}:$Lang::tr{'maximum retries'}$Lang::tr{'maximum retries'}
+ - + - - - - + + + + + + END ; @@ -708,29 +713,24 @@ END if ($pppsettings{'TYPE'} eq 'pptp') { print < - -



$Lang::tr{'isdn settings'}		$Lang::tr{'isdn settings'}
$Lang::tr{'use ibod'}$Lang::tr{'use dov'}$Lang::tr{'use ibod'}
$Lang::tr{'use dov'}
+ - + - - + + + - - - + + + - - - - - - - + + + END ; @@ -738,180 +738,59 @@ END if ($pppsettings{'TYPE'} eq 'pppoe') { print < -



$Lang::tr{'pptp settings'}		$Lang::tr{'pptp settings'}
$Lang::tr{'phonebook entry'}$Lang::tr{'phonebook entry'}
$Lang::tr{'static ip'}$Lang::tr{'router ip'}$Lang::tr{'static ip'}$Lang::tr{'router ip'}
 
$Lang::tr{'dhcp mode'}$Lang::tr{'hostname'}: *$Lang::tr{'dhcp mode'}$Lang::tr{'hostname'}: *
- - - -END -; -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/) -{ - -print < -

$Lang::tr{'pppoe settings'}
- - - - - - - - - - - - - -END -; -} -if ($pppsettings{'TYPE'} eq 'bewanadsl') -{ -print < - - - + - - - -END -; -} -if ($pppsettings{'TYPE'} =~ /^(3cp4218usbadsl|bewanadsl)$/) -{ -print < - - - - - + + + - - + + + END ; } -if ($pppsettings{'TYPE'} eq 'eagleusbadsl') +if ($pppsettings{'TYPE'} eq 'fritzdsl') { print < - - + - - - -END -; -} -if ($pppsettings{'TYPE'} eq 'eciadsl') -{ -print < - - + + - - + + -END -; -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/) -{ -print < - - -END -; -} -if ($pppsettings{'TYPE'} eq 'alcatelusb') -{ - print ""; -} - -if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl|fritzdsl)$/) -{ -print <$Lang::tr{'encapsulation'}: - + + + + + + + + -END -; -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/) -{ -print < - - - - - -END -; -} -if ($pppsettings{'TYPE'} eq 'alcatelusb') -{ - print ""; -} - -if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl|fritzdsl)$/) -{ - if ($pppsettings{'TYPE'} ne 'fritzdsl') - { -print <$Lang::tr{'encapsulation'}: - + - - - - -END -; - } else { -print <PPPoE - -END -; - } -} -if ($pppsettings{'TYPE'} =~ /^(pppoe|alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl)$/) -{ -print < - - - - - - - - - - - - - - -END -; -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl)$/) -{ -print < - - - - - - - - - - - - - - - - - - - - - - - - - - - - -END -; - if ($pppsettings{'TYPE'} =~ /^(eciadsl|eagleusbadsl)$/) - { -print < - - - - - - - - - - END ; - } -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|eciadsl|fritzdsl)$/) { - print ""; -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk)$/) { - my $speedtouch = &Header::speedtouchversion; - if (($speedtouch >= 0) && ($speedtouch <=4)) { - my $modem; - if ($speedtouch ==4) { $modem='v4_b'; } else { $modem='v0123'; } - print ""; - if (-e "${General::swroot}/alcatelusb/firmware.$modem.bin") { - print "\n"; - } else { - print "\n"; - } - } else { - print ""; - } -} elsif ($pppsettings{'TYPE'} eq 'eciadsl') { - print ""; - if (-e "${General::swroot}/eciadsl/synch.bin") { - print "\n"; - } else { - print "\n"; } -} elsif ($pppsettings{'TYPE'} eq 'fritzdsl') { - print ""; + print ""; if (-e "/lib/modules/$kernel/misc/fcdslusb.o.gz") { - print "\n"; + print ""; } else { - print "\n"; } + print ""; } } + print < -

$Lang::tr{'adsl settings'}:
$Lang::tr{'vpi number'}$Lang::tr{'vci number'}
 


$Lang::tr{'modem'}: - Bewan ADSL PCI stBewan ADSL USB st$Lang::tr{'pppoe settings'}
 
$Lang::tr{'modulation'}:$Lang::tr{'automatic'}ANSI T1.483G.DMTG.LitePPPoE plugin$Lang::tr{'service name'} *
 
$Lang::tr{'pppoe'}$Lang::tr{'concentrator name'} *


$Lang::tr{'country'}: - $Lang::tr{'adsl settings'}:
 
$Lang::tr{'modem'}: - $Lang::tr{'vpi number'}
 
$Lang::tr{'vci number'}
$Lang::tr{'protocol'}: - RFC2364 PPPoA 
- $Lang::tr{'protocol'}:RFC2364 PPPoA
RFC 1483 / 2684
$Lang::tr{'encapsulation'}: +
 
  - RFC 1483 / 2684 
- $Lang::tr{'encapsulation'}: +
 
  PPPoE plugin$Lang::tr{'service name'} *
  $Lang::tr{'pppoe'}$Lang::tr{'concentrator name'} *
 
  $Lang::tr{'static ip'}$Lang::tr{'static ip'}:
  $Lang::tr{'gateway ip'}:
  $Lang::tr{'netmask'}:
  $Lang::tr{'broadcast'}: *
 
  $Lang::tr{'dhcp mode'}$Lang::tr{'hostname'}: *
 
$Lang::tr{'firmware'}:$Lang::tr{'present'} 
$Lang::tr{'not present'} 
$Lang::tr{'unknown'} Rev $speedtouch
$Lang::tr{'driver'}:$Lang::tr{'present'} 
$Lang::tr{'not present'} 
$Lang::tr{'driver'}:
$Lang::tr{'driver'}:$Lang::tr{'present'} 
$Lang::tr{'present'}
$Lang::tr{'not present'} 
$Lang::tr{'not present'}
+ - + - - - - + + + + - - + - - + + -



$Lang::tr{'authentication'}		$Lang::tr{'authentication'}
$Lang::tr{'username'}$Lang::tr{'password'}$Lang::tr{'username'}$Lang::tr{'password'}
$Lang::tr{'method'}$Lang::tr{'method'}$Lang::tr{'script name'} *$Lang::tr{'script name'} *
- + - + - + - - - - - + - + + + + + - - - - + + - + - - + +



DNS:		DNS:
$Lang::tr{'automatic'}$Lang::tr{'automatic'}
$Lang::tr{'manual'}$Lang::tr{'primary dns'}$Lang::tr{'secondary dns'}$Lang::tr{'manual'}

$Lang::tr{'primary dns'}$Lang::tr{'secondary dns'}




 $Lang::tr{'profile name'}$Lang::tr{'profile name'} +

$Lang::tr{'legend'}:* $Lang::tr{'this field may be blank'}$Lang::tr{'legend'}:* $Lang::tr{'this field may be blank'}
END diff --git a/lfs/GD-Graph b/lfs/GD-Graph new file mode 100644 index 0000000000..f32a1e4c9c --- /dev/null +++ b/lfs/GD-Graph @@ -0,0 +1,79 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.4308 + +THISAPP = GDGraph-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = fcdd34d5e09ae917b5d264887734b3b1 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/initrd b/lfs/initrd index bb4303bed6..8c2bd68518 100644 --- a/lfs/initrd +++ b/lfs/initrd @@ -73,9 +73,9 @@ $(TARGET) : depmod -a -F /boot/System.map-$(KVER)-ipfire-smp $(KVER)-ipfire-smp cd / && tar -cvf /tmp/drivers.tar \ - --exclude=lib/modules/$(KVER)-ipfire/kernel/{arch,fs} \ - --exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,hwmon,ide} \ - --exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{ieee1394,isdn,mmc,scsi,md,video} \ + --exclude=lib/modules/$(KVER)-ipfire/kernel/{arch,crypto} \ + --exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,connector,cpufreq,hwmon,ide} \ + --exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{ieee1394,isdn,mmc,md,parport,video} \ --exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/net/{wan,ppp*,slip*,slhc*,tun*,wireless} \ --exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{atm,input,storage,host} \ --exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{3cp4218.ko,acm.ko,amedyn.ko,cxacru.ko} \ @@ -87,10 +87,6 @@ $(TARGET) : cd /install/initrd/ && tar -xvf /tmp/drivers.tar && rm -f /tmp/drivers.tar # Extra modules - -mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/scsi - cp -af /lib/modules/$(KVER)-ipfire/kernel/drivers/scsi/*.ko \ - /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/scsi/ - -mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage/*.ko \ /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage/ @@ -107,10 +103,6 @@ $(TARGET) : cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core/*.ko \ /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core - # File system - -mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/fs - cp -rf /lib/modules/$(KVER)-ipfire/kernel/fs/* /install/initrd/lib/modules/$(KVER)-ipfire/kernel/fs - cp -f /lib/modules/$(KVER)-ipfire/modules.* /install/initrd/lib/modules/$(KVER)-ipfire cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/ diff --git a/make.sh b/make.sh index 25b338966a..9a2aaf878a 100644 --- a/make.sh +++ b/make.sh @@ -393,6 +393,7 @@ buildipfire() { ipfiremake ez-ipupdate ipfiremake fcron ipfiremake GD + ipfiremake GD-Graph ipfiremake gnupg ipfiremake hdparm ipfiremake ibod diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index e5e9892233..9bd629dc10 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -128,7 +128,6 @@ int main(int argc, char *argv[]) } } - // make some beeps before wiping the system :) if (unattended) { runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds..."); } @@ -165,8 +164,7 @@ int main(int argc, char *argv[]) rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message, 50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK], ctr[TR_CANCEL], NULL); - } - else { + } else { rc = 1; installtype = CDROM_INSTALL; } @@ -179,7 +177,6 @@ int main(int argc, char *argv[]) /* CDROM INSTALL */ if (installtype == CDROM_INSTALL) { - switch (mysystem("/bin/mountsource.sh")) { case 0: installtype = CDROM_INSTALL; @@ -215,7 +212,7 @@ int main(int argc, char *argv[]) goto EXIT; } - /* Check for ipcop-.tbz2 */ + /* Check for ipfire-.tbz2 */ if (checktarball(SNAME "-" VERSION ".tbz2", ctr[TR_ENTER_URL])) { errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]); goto EXIT; @@ -527,36 +524,35 @@ int main(int argc, char *argv[]) mysystem("/bin/mount -t proc none /harddisk/proc"); mysystem("/bin/mount --bind /dev /harddisk/dev"); + /* Build cache lang file */ + snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\""); + if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE])) + { + errorbox(ctr[TR_UNABLE_TO_INSTALL_LANG_CACHE]); + goto EXIT; + } + + /* Update /etc/fstab */ + replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode); - /* if we detected SCSI then fixup */ - /* doesn't really work cause it sometimes creates a ramdisk on ide systems */ -/* mysystem("/bin/probecntrl.sh"); - if ((handle = fopen("/cntrldriver", "r"))) + /* if we detected SCSI/USB then fixup */ + mysystem("/bin/probecntrl.sh"); + if ((handle = fopen("/tmp/cntrldriver", "r"))) { char *driver; - fgets(line, STRING_SIZE-1, handle); - fclose(handle); + fgets(line, STRING_SIZE-1, handle); + fclose(handle); line[strlen(line) - 1] = 0; driver = strtok(line, "."); - fprintf(flog, "Detected SCSI driver %s\n",driver); if (strlen(driver) > 1) { fprintf(flog, "Fixing up ipfirerd.img\n"); - mysystem("/sbin/chroot /harddisk /sbin/modprobe loop"); mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO); - snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd.img %s", driver, KERNEL_VERSION); + snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd.img %s-ipfire", driver, KERNEL_VERSION); runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]); - snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd-smp.img %s-smp", driver, KERNEL_VERSION); + snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd-smp.img %s-ipfire-smp", driver, KERNEL_VERSION); runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]); mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf"); } - } */ - - /* Build cache lang file */ - snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\""); - if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE])) - { - errorbox(ctr[TR_UNABLE_TO_INSTALL_LANG_CACHE]); - goto EXIT; } if (raid_disk) @@ -576,9 +572,6 @@ int main(int argc, char *argv[]) goto EXIT; } - /* Update /etc/fstab */ - replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode); - /* Install bootsplash */ mysystem("/bin/installbootsplash.sh"); diff --git a/src/install+setup/install/probecntrl.sh b/src/install+setup/install/probecntrl.sh index 6515fada4e..5c58a39102 100644 --- a/src/install+setup/install/probecntrl.sh +++ b/src/install+setup/install/probecntrl.sh @@ -1,13 +1,19 @@ #!/bin/sh -echo "Probing for SCSI controllers" -MODULE=`/bin/kudzu -qps -t 30 -c SCSI | grep driver | cut -d ' ' -f 2 | sort | uniq` +echo "Probing for storage controllers" +for MODULE in $(hwinfo --usb --usb-ctrl --storage-ctrl | grep modprobe | awk '{ print $5 }' | tr -d \" | sort | uniq); do + if [ "${MODULE}" = "piix" ]; then + continue + fi + if grep -Eqe "^${MODULE} " /proc/modules; then + MODULES="${MODULES} --with=${MODULE}" + echo "Found: ${MODULE}" + fi +done -if [ "$MODULE" ]; then - echo $MODULE > /tmp/cntrldriver - echo "Your controller is: $MODULE" +if [ -z "${MODULES}" ]; then + exit 1 +else + echo "${MODULES}" > /tmp/cntrldriver exit 0 fi - -echo "No SCSI controller found" -exit 1 diff --git a/src/install+setup/install/unattended.c b/src/install+setup/install/unattended.c index d7ff113a9f..0606b3d93c 100644 --- a/src/install+setup/install/unattended.c +++ b/src/install+setup/install/unattended.c @@ -15,7 +15,7 @@ * along with IPFire; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Copyright 2002: Mark Wormgoor + * Copyright 2007: Michael Tremer for www.ipfire.org * */ diff --git a/src/install+setup/install/usb.c b/src/install+setup/install/usb.c index 826ab1bb97..19b7bfb675 100644 --- a/src/install+setup/install/usb.c +++ b/src/install+setup/install/usb.c @@ -29,6 +29,7 @@ int initialize_usb() { mysystem("/sbin/modprobe sd_mod"); mysystem("/sbin/modprobe sr_mod"); mysystem("/sbin/modprobe usb-storage"); + mysystem("/sbin/modprobe vfat"); if (ehcihcd) { mysystem("/sbin/rmmod ehci-hcd"); @@ -51,7 +52,7 @@ int initialize_usb() { usbuhci = 1; mysystem("/sbin/modprobe usbhid"); - mysystem("udevstart"); + mysystem("/sbin/udevstart"); return 0; } diff --git a/src/nash/Makefile b/src/nash/Makefile index 5cb6979a1d..602fe520f3 100644 --- a/src/nash/Makefile +++ b/src/nash/Makefile @@ -1,23 +1,18 @@ -CFLAGS=-Wall -DVERSION=\"$(VERSION)\" -g +CFLAGS=-Wall -Werror -DVERSION=\"$(VERSION)\" -g -D_FORTIFY_SOURCE=2 VERSION=$(shell awk -F= '/^VERSION=/ { print $$2 }' mkinitrd) ARCH := $(patsubst i%86,i386,$(shell uname -m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) -#ifeq (i386, $(ARCH)) -#CC:=diet $(CC) -#CFLAGS += -DUSE_DIET=1 -#else STATIC=-static -#endif mandir=usr/share/man -nash: nash.o mount_by_label.o - $(CC) $(STATIC) -g $(LDFLAGS) -o $@ nash.o mount_by_label.o +nash: nash.o mount_by_label.o name_to_dev_t.o + $(CC) $(STATIC) -g $(LDFLAGS) -o $@ $^ clean: - rm -f nash $(MINILIBC) nash.o mount_by_label.o + rm -f nash $(MINILIBC) *.o install: mkdir -p $(BUILDROOT)/sbin diff --git a/src/nash/linux_fs.h b/src/nash/linux_fs.h index e584220ac3..c84d4218d4 100644 --- a/src/nash/linux_fs.h +++ b/src/nash/linux_fs.h @@ -1,181 +1,181 @@ -/* Including became more and more painful. - Below a very abbreviated version of some declarations, - only designed to be able to check a magic number - in case no filesystem type was given. */ - -#ifndef BLKGETSIZE -#ifndef _IO -/* pre-1.3.45 */ -#define BLKGETSIZE 0x1260 /* return device size */ -#else -/* same on i386, m68k, arm; different on alpha, mips, sparc, ppc */ -#define BLKGETSIZE _IO(0x12,96) -#endif -#endif - -#define MINIX_SUPER_MAGIC 0x137F /* original minix fs */ -#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */ -struct minix_super_block { - unsigned char s_dummy[16]; - unsigned char s_magic[2]; -}; -#define minixmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8)) - -#define ISODCL(from, to) (to - from + 1) -#define ISO_STANDARD_ID "CD001" -struct iso_volume_descriptor { - char type[ISODCL(1,1)]; /* 711 */ - char id[ISODCL(2,6)]; - char version[ISODCL(7,7)]; - char data[ISODCL(8,2048)]; -}; - -#define HS_STANDARD_ID "CDROM" -struct hs_volume_descriptor { - char foo[ISODCL ( 1, 8)]; /* 733 */ - char type[ISODCL ( 9, 9)]; /* 711 */ - char id[ISODCL ( 10, 14)]; - char version[ISODCL ( 15, 15)]; /* 711 */ - char data[ISODCL(16,2048)]; -}; - -#define EXT_SUPER_MAGIC 0x137D -struct ext_super_block { - unsigned char s_dummy[56]; - unsigned char s_magic[2]; -}; -#define extmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8)) - -#define EXT2_PRE_02B_MAGIC 0xEF51 -#define EXT2_SUPER_MAGIC 0xEF53 -#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 -struct ext2_super_block { - unsigned char s_dummy1[56]; - unsigned char s_magic[2]; - unsigned char s_dummy2[34]; - unsigned char s_feature_compat[4]; - unsigned char s_feature_incompat[4]; - unsigned char s_feature_ro_compat[4]; - unsigned char s_uuid[16]; - unsigned char s_volume_name[16]; - unsigned char s_dummy3[88]; - unsigned char s_journal_inum[4]; /* ext3 only */ -}; -#define ext2magic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8)) - -struct reiserfs_super_block -{ - unsigned char s_block_count[4]; - unsigned char s_free_blocks[4]; - unsigned char s_root_block[4]; - unsigned char s_journal_block[4]; - unsigned char s_journal_dev[4]; - unsigned char s_orig_journal_size[4]; - unsigned char s_journal_trans_max[4]; - unsigned char s_journal_block_count[4]; - unsigned char s_journal_max_batch[4]; - unsigned char s_journal_max_commit_age[4]; - unsigned char s_journal_max_trans_age[4]; - unsigned char s_blocksize[2]; - unsigned char s_oid_maxsize[2]; - unsigned char s_oid_cursize[2]; - unsigned char s_state[2]; - unsigned char s_magic[12]; -}; -#define REISERFS_SUPER_MAGIC_STRING "ReIsErFs" -#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" -#define REISERFS_DISK_OFFSET_IN_BYTES (64 * 1024) -/* the spot for the super in versions 3.5 - 3.5.10 (inclusive) */ -#define REISERFS_OLD_DISK_OFFSET_IN_BYTES (8 * 1024) - -#define _XIAFS_SUPER_MAGIC 0x012FD16D -struct xiafs_super_block { - unsigned char s_boot_segment[512]; /* 1st sector reserved for boot */ - unsigned char s_dummy[60]; - unsigned char s_magic[4]; -}; -#define xiafsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8) + \ - (((unsigned int) s.s_magic[2]) << 16) + \ - (((unsigned int) s.s_magic[3]) << 24)) - -/* From jj@sunsite.ms.mff.cuni.cz Mon Mar 23 15:19:05 1998 */ -#define UFS_SUPER_MAGIC 0x00011954 -struct ufs_super_block { - unsigned char s_dummy[0x55c]; - unsigned char s_magic[4]; -}; -#define ufsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8) + \ - (((unsigned int) s.s_magic[2]) << 16) + \ - (((unsigned int) s.s_magic[3]) << 24)) - -/* From Richard.Russon@ait.co.uk Wed Feb 24 08:05:27 1999 */ -#define NTFS_SUPER_MAGIC "NTFS" -struct ntfs_super_block { - unsigned char s_dummy[3]; - unsigned char s_magic[4]; -}; - -/* From inspection of a few FAT filesystems - aeb */ -/* Unfortunately I find almost the same thing on an extended partition; - it looks like a primary has some directory entries where the extended - has a partition table: IO.SYS, MSDOS.SYS, WINBOOT.SYS */ -struct fat_super_block { - unsigned char s_dummy[3]; - unsigned char s_os[8]; /* "MSDOS5.0" or "MSWIN4.0" or "MSWIN4.1" */ - /* mtools-3.9.4 writes "MTOOL394" */ - unsigned char s_dummy2[32]; - unsigned char s_label[11]; /* for DOS? */ - unsigned char s_fs[8]; /* "FAT12 " or "FAT16 " or all zero */ - /* OS/2 BM has "FAT " here. */ - unsigned char s_dummy3[9]; - unsigned char s_label2[11]; /* for Windows? */ - unsigned char s_fs2[8]; /* garbage or "FAT32 " */ -}; - -#define XFS_SUPER_MAGIC "XFSB" -struct xfs_super_block { - unsigned char s_magic[4]; - unsigned char s_dummy[28]; - unsigned char s_uuid[16]; - unsigned char s_dummy2[60]; - unsigned char s_fname[12]; -}; - -#define CRAMFS_SUPER_MAGIC 0x28cd3d45 -struct cramfs_super_block { - unsigned char s_magic[4]; - unsigned char s_dummy[12]; - unsigned char s_id[16]; -}; -#define cramfsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8) + \ - (((unsigned int) s.s_magic[2]) << 16) + \ - (((unsigned int) s.s_magic[3]) << 24)) - -#define HFS_SUPER_MAGIC 0x4244 -struct hfs_super_block { - unsigned char s_magic[2]; - unsigned char s_dummy[18]; - unsigned char s_blksize[4]; -}; -#define hfsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8)) -#define hfsblksize(s) ((unsigned int) s.s_blksize[0] + \ - (((unsigned int) s.s_blksize[1]) << 8) + \ - (((unsigned int) s.s_blksize[2]) << 16) + \ - (((unsigned int) s.s_blksize[3]) << 24)) - -#define HPFS_SUPER_MAGIC 0xf995e849 -struct hpfs_super_block { - unsigned char s_magic[4]; - unsigned char s_magic2[4]; -}; -#define hpfsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8) + \ - (((unsigned int) s.s_magic[2]) << 16) + \ - (((unsigned int) s.s_magic[3]) << 24)) - -struct adfs_super_block { - unsigned char s_dummy[448]; - unsigned char s_blksize[1]; - unsigned char s_dummy2[62]; - unsigned char s_checksum[1]; -}; -#define adfsblksize(s) ((unsigned int) s.s_blksize[0]) +/* Including became more and more painful. + Below a very abbreviated version of some declarations, + only designed to be able to check a magic number + in case no filesystem type was given. */ + +#ifndef BLKGETSIZE +#ifndef _IO +/* pre-1.3.45 */ +#define BLKGETSIZE 0x1260 /* return device size */ +#else +/* same on i386, m68k, arm; different on alpha, mips, sparc, ppc */ +#define BLKGETSIZE _IO(0x12,96) +#endif +#endif + +#define MINIX_SUPER_MAGIC 0x137F /* original minix fs */ +#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */ +struct minix_super_block { + unsigned char s_dummy[16]; + unsigned char s_magic[2]; +}; +#define minixmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8)) + +#define ISODCL(from, to) (to - from + 1) +#define ISO_STANDARD_ID "CD001" +struct iso_volume_descriptor { + char type[ISODCL(1,1)]; /* 711 */ + char id[ISODCL(2,6)]; + char version[ISODCL(7,7)]; + char data[ISODCL(8,2048)]; +}; + +#define HS_STANDARD_ID "CDROM" +struct hs_volume_descriptor { + char foo[ISODCL ( 1, 8)]; /* 733 */ + char type[ISODCL ( 9, 9)]; /* 711 */ + char id[ISODCL ( 10, 14)]; + char version[ISODCL ( 15, 15)]; /* 711 */ + char data[ISODCL(16,2048)]; +}; + +#define EXT_SUPER_MAGIC 0x137D +struct ext_super_block { + unsigned char s_dummy[56]; + unsigned char s_magic[2]; +}; +#define extmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8)) + +#define EXT2_PRE_02B_MAGIC 0xEF51 +#define EXT2_SUPER_MAGIC 0xEF53 +#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 +struct ext2_super_block { + unsigned char s_dummy1[56]; + unsigned char s_magic[2]; + unsigned char s_dummy2[34]; + unsigned char s_feature_compat[4]; + unsigned char s_feature_incompat[4]; + unsigned char s_feature_ro_compat[4]; + unsigned char s_uuid[16]; + unsigned char s_volume_name[16]; + unsigned char s_dummy3[88]; + unsigned char s_journal_inum[4]; /* ext3 only */ +}; +#define ext2magic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8)) + +struct reiserfs_super_block +{ + unsigned char s_block_count[4]; + unsigned char s_free_blocks[4]; + unsigned char s_root_block[4]; + unsigned char s_journal_block[4]; + unsigned char s_journal_dev[4]; + unsigned char s_orig_journal_size[4]; + unsigned char s_journal_trans_max[4]; + unsigned char s_journal_block_count[4]; + unsigned char s_journal_max_batch[4]; + unsigned char s_journal_max_commit_age[4]; + unsigned char s_journal_max_trans_age[4]; + unsigned char s_blocksize[2]; + unsigned char s_oid_maxsize[2]; + unsigned char s_oid_cursize[2]; + unsigned char s_state[2]; + unsigned char s_magic[12]; +}; +#define REISERFS_SUPER_MAGIC_STRING "ReIsErFs" +#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" +#define REISERFS_DISK_OFFSET_IN_BYTES (64 * 1024) +/* the spot for the super in versions 3.5 - 3.5.10 (inclusive) */ +#define REISERFS_OLD_DISK_OFFSET_IN_BYTES (8 * 1024) + +#define _XIAFS_SUPER_MAGIC 0x012FD16D +struct xiafs_super_block { + unsigned char s_boot_segment[512]; /* 1st sector reserved for boot */ + unsigned char s_dummy[60]; + unsigned char s_magic[4]; +}; +#define xiafsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8) + \ + (((unsigned int) s.s_magic[2]) << 16) + \ + (((unsigned int) s.s_magic[3]) << 24)) + +/* From jj@sunsite.ms.mff.cuni.cz Mon Mar 23 15:19:05 1998 */ +#define UFS_SUPER_MAGIC 0x00011954 +struct ufs_super_block { + unsigned char s_dummy[0x55c]; + unsigned char s_magic[4]; +}; +#define ufsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8) + \ + (((unsigned int) s.s_magic[2]) << 16) + \ + (((unsigned int) s.s_magic[3]) << 24)) + +/* From Richard.Russon@ait.co.uk Wed Feb 24 08:05:27 1999 */ +#define NTFS_SUPER_MAGIC "NTFS" +struct ntfs_super_block { + unsigned char s_dummy[3]; + unsigned char s_magic[4]; +}; + +/* From inspection of a few FAT filesystems - aeb */ +/* Unfortunately I find almost the same thing on an extended partition; + it looks like a primary has some directory entries where the extended + has a partition table: IO.SYS, MSDOS.SYS, WINBOOT.SYS */ +struct fat_super_block { + unsigned char s_dummy[3]; + unsigned char s_os[8]; /* "MSDOS5.0" or "MSWIN4.0" or "MSWIN4.1" */ + /* mtools-3.9.4 writes "MTOOL394" */ + unsigned char s_dummy2[32]; + unsigned char s_label[11]; /* for DOS? */ + unsigned char s_fs[8]; /* "FAT12 " or "FAT16 " or all zero */ + /* OS/2 BM has "FAT " here. */ + unsigned char s_dummy3[9]; + unsigned char s_label2[11]; /* for Windows? */ + unsigned char s_fs2[8]; /* garbage or "FAT32 " */ +}; + +#define XFS_SUPER_MAGIC "XFSB" +struct xfs_super_block { + unsigned char s_magic[4]; + unsigned char s_dummy[28]; + unsigned char s_uuid[16]; + unsigned char s_dummy2[60]; + unsigned char s_fname[12]; +}; + +#define CRAMFS_SUPER_MAGIC 0x28cd3d45 +struct cramfs_super_block { + unsigned char s_magic[4]; + unsigned char s_dummy[12]; + unsigned char s_id[16]; +}; +#define cramfsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8) + \ + (((unsigned int) s.s_magic[2]) << 16) + \ + (((unsigned int) s.s_magic[3]) << 24)) + +#define HFS_SUPER_MAGIC 0x4244 +struct hfs_super_block { + unsigned char s_magic[2]; + unsigned char s_dummy[18]; + unsigned char s_blksize[4]; +}; +#define hfsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8)) +#define hfsblksize(s) ((unsigned int) s.s_blksize[0] + \ + (((unsigned int) s.s_blksize[1]) << 8) + \ + (((unsigned int) s.s_blksize[2]) << 16) + \ + (((unsigned int) s.s_blksize[3]) << 24)) + +#define HPFS_SUPER_MAGIC 0xf995e849 +struct hpfs_super_block { + unsigned char s_magic[4]; + unsigned char s_magic2[4]; +}; +#define hpfsmagic(s) ((unsigned int) s.s_magic[0] + (((unsigned int) s.s_magic[1]) << 8) + \ + (((unsigned int) s.s_magic[2]) << 16) + \ + (((unsigned int) s.s_magic[3]) << 24)) + +struct adfs_super_block { + unsigned char s_dummy[448]; + unsigned char s_blksize[1]; + unsigned char s_dummy2[62]; + unsigned char s_checksum[1]; +}; +#define adfsblksize(s) ((unsigned int) s.s_blksize[0]) diff --git a/src/nash/mkinitrd b/src/nash/mkinitrd index 2a36352de1..cbd99feb91 100644 --- a/src/nash/mkinitrd +++ b/src/nash/mkinitrd @@ -1,7 +1,9 @@ -#!/bin/bash +#!/bin/bash --norc # mkinitrd # +# Copyright 2005 Red Hat, Inc. +# # Written by Erik Troan # # Contributors: @@ -20,14 +22,17 @@ # Preston Brown # Bill Nottingham # Guillaume Cottenceau +# Peter Jones +umask 0022 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH export PATH -VERSION=3.5.14 +VERSION=4.2.11 compress=1 +allowmissing="" target="" kernel="" force="" @@ -36,18 +41,28 @@ MODULES="" img_vers="" builtins="" pivot=1 +squashfs=1 +initramfs="" modulefile=/etc/modules.conf rc=0 -IMAGESIZE=5120 +IMAGESIZE=8000 PRESCSIMODS="scsi_mod sd_mod unknown" fstab="/etc/fstab" +if [ -f /etc/udev/udev.conf ]; then + USE_UDEV="yes" + UDEV_TMPFS="yes" + UDEV_KEEP_DEV="yes" + . /etc/udev/udev.conf + [ -x /sbin/udev.static ] || USE_UDEV= +fi + usage () { echo "usage: `basename $0` [--version] [-v] [-f] [--preload ]" >&2 echo " [--omit-scsi-modules] [--omit-raid-modules] [--omit-lvm-modules]" >&2 echo " [--with=] [--image-version] [--fstab=] [--nocompress]" >&2 - echo " [--builtin=] [--nopivot] " >&2 + echo " [--builtin=] [--nopivot] [--nosquashfs] " >&2 echo "" >&2 echo " (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)" >&2 exit 1 @@ -61,11 +76,11 @@ moduledep() { [ -n "$verbose" ] && echo -n "Looking for deps of module $1" deps=$(gawk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \ - function modname(filename) { match(filename, /\/([^\/]+)\.k?o/, ret); return ret[1] } \ + function modname(filename) { match(filename, /\/([^\/]+)\.k?o:?$/, ret); return ret[1] } \ function show() { if (orig == searched) { print dep; orig=""; rc=0; exit } } \ /^\/lib/ { show(); \ - orig=modname($1); \ - if ($2) { dep=modname($2) } else { dep="" } } \ + orig=modname($1); dep=""; \ + if ($2) { for (i = 2; i <= NF; i++) { dep=sprintf("%s %s", dep, modname($i)); } } } \ /^ / { dep=sprintf("%s %s", dep, modname($1)); } \ END { show(); exit(rc) }' /lib/modules/$kernel/modules.dep $1) [ -n "$verbose" ] && echo -e "\t$deps" @@ -90,7 +105,7 @@ findmodule() { modName=$(echo $modName | cut -b2-) fi - if echo $builtins | grep -E -q '(^| )'$modName'( |$)' ; then + if echo $builtins | egrep -q '(^| )'$modName'( |$)' ; then [ -n "$verbose" ] && echo "module $modName assumed to be built in" set +x return @@ -99,7 +114,7 @@ findmodule() { # special cases if [ "$modName" = "i2o_block" ]; then findmodule i2o_core - findmodule i2o_pci + findmodule -i2o_pci modName="i2o_block" elif [ "$modName" = "ppa" ]; then findmodule parport @@ -143,6 +158,11 @@ findmodule() { return; fi done; + + if [ -n "$allowmissing" ]; then + echo "WARNING: No module $modName found for kernel $kernel, continuing anyway" >&2 + return + fi echo "No module $modName found for kernel $kernel, aborting." >&2 exit 1 @@ -216,6 +236,10 @@ while [ $# -gt 0 ]; do pivot="" ;; + --nosquashfs) + squashfs="" + ;; + --ifneeded) # legacy ;; @@ -245,6 +269,12 @@ while [ $# -gt 0 ]; do --image-version) img_vers=yes ;; + --noudev) + USE_UDEV= + ;; + --allow-missing) + allowmissing=yes + ;; *) if [ -z "$target" ]; then target=$1 @@ -282,6 +312,21 @@ if [ $UID != 0 ]; then exit 1 fi +kernelmajor=`echo $kernel | cut -d . -f 1,2` + +#if [ "$kernelmajor" == "2.4" ]; then + if [ -n "$verbose" ]; then echo "Creating old-style initrd"; fi + USE_UDEV= +#else +# if [ -n "$verbose" ]; then echo "Creating initramfs"; fi +# modulefile=/etc/modprobe.conf +# initramfs=1 +# pivot="" +#fi + +# if we're not using udev, don't set any of the other bits +[ -z "$USE_UDEV" ] && UDEV_TMPFS= && UDEV_KEEP_DEV= + # find a temporary directory which doesn't use tmpfs TMPDIR="" for t in /tmp /var/tmp /root ${PWD}; do @@ -319,7 +364,7 @@ if [ -n "$withusb" ]; then if [ `which kudzu 2>/dev/null` ]; then host=$(kudzu --probe -b scsi | gawk '/^device: '${dev}'/,/^host:/ { if (/^host/) { print $2; exit; } }') - if [ -d /proc/scsi/usb-storage-${host} ]; then + if [ -d /proc/scsi/usb-storage-${host} -o -f /proc/scsi/usb-storage/${host} ]; then needusb=1 fi fi @@ -328,7 +373,7 @@ if [ -n "$withusb" ]; then fi if [ -n "$needusb" ]; then - drivers=$(gawk '/^alias usb-controller[0-9]* / { print $3}' < /etc/modules.conf) + drivers=$(gawk '/^alias[[:space:]]+usb-controller[0-9]* / { print $3}' < $modulefile) if [ -n "$drivers" ]; then for driver in $drivers; do findmodule $driver @@ -345,7 +390,7 @@ if [ -z "$noscsi" ]; then fi if [ -f $modulefile ]; then - scsimodules=`grep "alias[[:space:]]scsi_hostadapter" $modulefile | grep -v '^[ ]*#' | LC_ALL=C sort -u | gawk '{ print $3 }'` + scsimodules=`grep "alias[[:space:]]\+scsi_hostadapter" $modulefile | grep -v '^[ ]*#' | LC_ALL=C sort -u | gawk '{ print $3 }'` if [ -n "$scsimodules" ]; then for n in $PRESCSIMODS; do @@ -371,9 +416,20 @@ fi if [ -z "$nolvm" ]; then if [ -f /proc/lvm/global ]; then if grep -q '^VG:' /proc/lvm/global ; then - findmodule -lvm-mod + if [ "$kernelmajor" == "2.4" ]; then + findmodule -lvm-mod + else + findmodule -dm-mod + fi fi fi + + if [ -x /sbin/dmsetup -a -e /dev/mapper/control ]; then + dmout=$(/sbin/dmsetup ls 2>/dev/null) + if [ "$dmout" != "No devices found" -a "$dmout" != "" ]; then + findmodule -dm-mod + fi + fi fi # If we have dasd devices, include the necessary modules (S/390) @@ -395,7 +451,11 @@ if [ -z "$noraid" -a -f /proc/mdstat ]; then findmodule linear startraid=1 ;; - raid[0145]) + multipath) + findmodule multipath + startraid=1 + ;; + raid[01456]) findmodule $level startraid=1 ;; @@ -415,9 +475,9 @@ fi rootdev=$(gawk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' $fstab) if echo $rootdev | cut -d/ -f3 | grep -q loop ; then key="^# $(echo $rootdev | cut -d/ -f3 | tr '[a-z]' '[A-Z]'):" - if ! grep "$key" $fstab > /dev/null; then - echo "The root filesystem is on a $rootdev, but there is no magic entry in $fstab" 1>&2 - echo "for this device. Consult the mkinitrd man page for more information" 2>&2 + if ! grep "$key" $fstab >> /dev/null; then + echo "The root filesystem is on a $rootdev, but there is no magic entry in $fstab" >&2 + echo "for this device. Consult the mkinitrd man page for more information" >&2 exit 1 fi @@ -433,19 +493,31 @@ if echo $rootdev | cut -d/ -f3 | grep -q loop ; then basicmodules="$basicmodules -${loopFs}" # check if the root fs is on a logical volume elif ! echo $rootdev | cut -c1-6 |grep -q "LABEL=" ; then + root_vg=$(echo $rootdev | cut -d/ -f3) rootdev=$(echo "readlink $rootdev" | /sbin/nash --quiet) major=`ls -l $rootdev | sed -e "s/.* \\([0-9]\+\\), *[0-9]\+.*/\\1/"` [ "$major" != "58" ] || root_lvm=1 + if echo $rootdev |grep -q /dev/mapper 2>/dev/null ; then root_lvm=1 ; fi fi rootfs=$(gawk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab) -rootopts=$(gawk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab) +rootopts=$(gawk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab \ + | sed -e 's/\(^rw,\|rw,$\)//' -e 's/,rw,/,/' -e 's/^rw$/ro/') # in case the root filesystem is modular findmodule -${rootfs} if [ -n "$root_lvm" ]; then - findmodule -lvm-mod + if [ "$kernelmajor" == "2.4" ]; then + findmodule -lvm-mod + else + findmodule -dm-mod + # DM requires all of these to be there in case someone used the + # feature. broken. (#132001) + findmodule -dm-mirror + findmodule -dm-zero + findmodule -dm-snapshot + fi fi for n in $basicmodules; do @@ -459,60 +531,82 @@ fi MNTIMAGE=`mktemp -d ${TMPDIR}/initrd.XXXXXX` IMAGE=`mktemp ${TMPDIR}/initrd.img.XXXXXX` -MNTPOINT=`mktemp -d ${TMPDIR}/initrd.mnt.XXXXXX` -RCFILE=$MNTIMAGE/linuxrc +if [ -z "$initramfs" ]; then + MNTPOINT=`mktemp -d ${TMPDIR}/initrd.mnt.XXXXXX` + RCFILE=$MNTIMAGE/linuxrc +else + RCFILE=$MNTIMAGE/init +fi -if [ -z "$MNTIMAGE" -o -z "$IMAGE" -o -z "$MNTPOINT" ]; then +if [ -z "$MNTIMAGE" -o -z "$IMAGE" ]; then echo "Error creating temporaries. Try again" >&2 exit 1 fi -dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1 +if [ -z "$initramfs" ]; then + dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1 -LODEV=$(echo findlodev | /sbin/nash --quiet) + LODEV=$(echo findlodev | /sbin/nash --quiet) -if [ -z "$LODEV" ]; then + if [ -z "$LODEV" ]; then rm -rf $MNTIMAGE $MNTPOINT $IMAGE echo "All of your loopback devices are in use." >&2 exit 1 -fi + fi -losetup ${LODEV} $IMAGE || exit 1 + losetup ${LODEV} $IMAGE || exit 1 -# We have to "echo y |" so that it doesn't complain about $IMAGE not -# being a block device -echo y | mke2fs $LODEV $IMAGESIZE >/dev/null 2>/dev/null -tune2fs -i0 $LODEV >/dev/null + # We have to "echo y |" so that it doesn't complain about $IMAGE not + # being a block device + echo y | mkfs.minix -i 100 $LODEV $IMAGESIZE >/dev/null 2>/dev/null -if [ -n "$verbose" ]; then - echo "Using loopback device $LODEV" -fi + if [ -n "$verbose" ]; then + echo "Using loopback device $LODEV" + fi -mkdir -p $MNTPOINT -mount -t ext2 $LODEV $MNTPOINT || { + mkdir -p $MNTPOINT + mount -t minix $LODEV $MNTPOINT || { echo "Can't get a loopback device" exit 1 -} + } + + # We don't need this directory, so let's save space + rmdir $MNTPOINT/lost+found >/dev/null 2>&1 +fi mkdir -p $MNTIMAGE mkdir -p $MNTIMAGE/lib mkdir -p $MNTIMAGE/bin mkdir -p $MNTIMAGE/etc mkdir -p $MNTIMAGE/dev +mkdir -p $MNTIMAGE/hd mkdir -p $MNTIMAGE/loopfs mkdir -p $MNTIMAGE/proc +mkdir -p $MNTIMAGE/sys mkdir -p $MNTIMAGE/sysroot ln -s bin $MNTIMAGE/sbin -# We don't need this directory, so let's save space -rm -rf $MNTPOINT/lost+found - inst /sbin/nash "$MNTIMAGE/bin/nash" inst /sbin/insmod.static "$MNTIMAGE/bin/insmod" +inst /bin/tar.static "$MNTIMAGE/bin/tar" +inst /usr/bin/lzmadec "$MNTIMAGE/bin/lzmadec" +inst /sbin/fsck.minix.static "$MNTIMAGE/bin/fsck.minix" ln -s /sbin/nash $MNTIMAGE/sbin/modprobe +if [ -n "$USE_UDEV" ]; then + inst /sbin/udev.static $MNTIMAGE/sbin/udev + inst /sbin/udevstart.static $MNTIMAGE/sbin/udevstart + mkdir -p $MNTIMAGE/etc/udev + inst /etc/udev/udev.conf $MNTIMAGE/etc/udev/udev.conf + ln -s /sbin/nash $MNTIMAGE/sbin/hotplug +fi + for MODULE in $MODULES; do - cp $verbose -a /lib/modules/$kernel/$MODULE $MNTIMAGE/lib + if [ -x /usr/bin/strip ]; then + /usr/bin/strip -g $verbose /lib/modules/$kernel/$MODULE -o $MNTIMAGE/lib/$(basename $MODULE) + else + cp $verbose -a /lib/modules/$kernel/$MODULE $MNTIMAGE/lib + fi done # mknod'ing the devices instead of copying them works both with and @@ -526,7 +620,7 @@ for i in 1 2 3 4; do done # FIXME -- this won't work if you're using devfs -if [ -n "$root_lvm" ]; then +if [ -n "$root_lvm" -a "$kernelmajor" == "2.4" ]; then pvs=$(/sbin/pvscan | grep " PV " | gawk {'print $5;'} |sed 's/"//g') for pv in $pvs; do cp $verbose --parents -a $pv $MNTIMAGE/ @@ -539,9 +633,44 @@ if [ -n "$root_lvm" ]; then mknod $MNTIMAGE/dev/lvm b 109 0 fi -echo "#!/bin/nash" > $RCFILE +if [ -n "$root_lvm" -a "$kernelmajor" == "2.6" ]; then + inst /sbin/lvm.static "$MNTIMAGE/bin/lvm" + if [ -f /etc/lvm/lvm.conf ]; then + cp $verbose --parents /etc/lvm/lvm.conf $MNTIMAGE/ + fi +fi + +echo "#!/bin/nash" >| $RCFILE echo "" >> $RCFILE +echo "mount -t proc /proc /proc" >> $RCFILE +echo "setquiet" >> $RCFILE +echo "echo Mounted /proc filesystem" >> $RCFILE + +if [ "$kernelmajor" != "2.4" ]; then + echo "echo Mounting sysfs" >> $RCFILE + echo "mount -t sysfs /sys /sys" >> $RCFILE +fi + +if [ -n "$USE_UDEV" ]; then + if [ -n "$UDEV_TMPFS" ]; then + cat >> $RCFILE <> $RCFILE < /proc/sys/kernel/hotplug +EOF +fi + for MODULE in $MODULES; do text="" module=`echo $MODULE | sed "s|.*/||" | sed "s/.k\?o$//"` @@ -561,12 +690,26 @@ for MODULE in $MODULES; do # Hack - we need a delay after loading usb-storage to give things # time to settle down before we start looking a block devices if [ "$module" = "usb-storage" ]; then - echo "sleep 5" >> $RCFILE + echo "sleep 8" >> $RCFILE + fi + if [ "$module" = "zfcp" -a -f /etc/zfcp.conf ]; then + echo "sleep 2" >> $RCFILE + cat /etc/zfcp.conf | grep -v "^#" | tr "A-Z" "a-z" | while read DEVICE SCSIID WWPN SCSILUN FCPLUN; do + echo "echo -n $WWPN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/port_add" >>$RCFILE + echo "echo -n $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add" >>$RCFILE + echo "echo -n 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/online" >>$RCFILE + done fi done -echo "echo Mounting /proc filesystem" >> $RCFILE -echo "mount -t proc /proc /proc" >> $RCFILE +# HACK: module loading + device creation isn't necessarily synchronous... +# this will make sure that we have all of our devices before trying +# things like RAID or LVM +if [ -n "$USE_UDEV" ]; then + echo "/sbin/udevstart" >> $RCFILE +fi + +echo "sleep 2" >> $RCFILE if [ -n "$startraid" ]; then for dev in $raiddevices; do @@ -575,8 +718,12 @@ if [ -n "$startraid" ]; then done fi -echo "echo Creating block devices" >> $RCFILE -echo "mkdevices /dev" >> $RCFILE +if [ -z "$USE_UDEV" ]; then + echo "echo Creating block devices" >> $RCFILE + echo "mkdevices /dev" >> $RCFILE +fi + +echo "mknod /dev/loop0 b 7 0" >> $RCFILE if [ -n "$loopDev" ]; then mkdir /initrd @@ -587,40 +734,91 @@ if [ -n "$loopDev" ]; then echo "echo Setting up loopback device $rootdev" >> $RCFILE echo "losetup $rootdev /loopfs$loopFile" >> $RCFILE elif [ -n "$root_lvm" ]; then + if [ "$kernelmajor" == "2.4" ]; then echo "echo Scanning logical volumes" >> $RCFILE echo "vgscan" >> $RCFILE echo "echo Activating logical volumes" >> $RCFILE echo "vgchange -ay" >> $RCFILE -else - echo "echo Creating root device" >> $RCFILE - echo "mkrootdev /dev/root" >> $RCFILE - rootdev=/dev/root + else + echo "echo Making device-mapper control node" >> $RCFILE + echo "mkdmnod" >> $RCFILE + echo "echo Scanning logical volumes" >> $RCFILE + echo "lvm vgscan --ignorelockingfailure" >> $RCFILE + echo "echo Activating logical volumes" >> $RCFILE + echo "lvm vgchange -ay --ignorelockingfailure $root_vg" >> $RCFILE + fi fi -if [ -n "$pivot" ]; then +echo "echo Creating root device" >> $RCFILE +echo "mkrootdev /dev/root" >> $RCFILE +rootdev=/dev/root + +if [ -n "$initramfs" ]; then + echo "echo Mounting root filesystem" >> $RCFILE + if [ -n "$squashfs" ]; then + echo "mount -o $rootopts --ro -t $rootfs $rootdev /sysroot" >> $RCFILE + else + echo "fsck.minix $rootdev" >> $RCFILE + echo "mount -o $rootopts -t minix $rootdev /hd" >> $RCFILE + echo "losetup /dev/loop0 /hd/ipcop-1.5.0a1.squashfs" >> $RCFILE + echo "mount --ro -t squashfs /dev/loop0 /sysroot" >> $RCFILE + echo "mount -t tmpfs none /sysroot/var" >> $RCFILE + echo "echo Unpacking IPCop configuration.. Please wait.." >> $RCFILE + echo "tar -C /sysroot -xjf /hd/ipcop.tbz2" >> $RCFILE + fi + + echo "echo Switching to new root" >> $RCFILE + if [ -n "$UDEV_KEEP_DEV" ]; then + echo "switchroot --movedev /sysroot" >> $RCFILE + else + echo "switchroot /sysroot" >> $RCFILE + fi +else + if [ "$kernelmajor" != "2.4" ]; then + echo "umount /sys" >> $RCFILE + fi + + if [ -n "$pivot" ]; then echo "echo 0x0100 > /proc/sys/kernel/real-root-dev" >> $RCFILE echo "echo Mounting root filesystem" >> $RCFILE - echo "mount -o $rootopts --ro -t $rootfs $rootdev /sysroot" >> $RCFILE + if [ -n "$squashfs" ]; then + echo "mount -o $rootopts --ro -t $rootfs $rootdev /sysroot" >> $RCFILE + else + echo "fsck.minix $rootdev" >> $RCFILE + echo "mount -o $rootopts -t minix $rootdev /hd" >> $RCFILE + echo "losetup /dev/loop0 /hd/ipcop-1.5.0a1.squashfs" >> $RCFILE + echo "mount --ro -t squashfs /dev/loop0 /sysroot" >> $RCFILE + echo "mount -t tmpfs none /sysroot/var" >> $RCFILE + echo "echo Unpacking IPCop configuration.. Please wait.." >> $RCFILE + echo "tar -C /sysroot -xjf /hd/ipcop.tbz2" >> $RCFILE + fi echo "pivot_root /sysroot /sysroot/initrd" >> $RCFILE echo "umount /initrd/proc" >> $RCFILE -else + else echo "umount /proc" >> $RCFILE -fi + fi + [ -n "$UDEV_TMPFS" ] && echo "umount /initrd/dev" >> $RCFILE +fi chmod +x $RCFILE -(cd $MNTIMAGE; tar cf - .) | (cd $MNTPOINT; tar xf -) || exit 1 +if [ -z "$initramfs" ]; then + (cd $MNTIMAGE; tar cf - .) | (cd $MNTPOINT; tar xf -) || exit 1 -umount $MNTPOINT -losetup -d $LODEV + umount $MNTPOINT + losetup -d $LODEV +else + (cd $MNTIMAGE; find . | cpio --quiet -c -o) >| $IMAGE || exit 1 +fi if [ -n "$compress" ]; then - gzip -9 < $IMAGE > $target || rc=1 + gzip -9 < $IMAGE >| $target || rc=1 else cp -a $IMAGE $target || rc=1 fi -rm -rf $MNTIMAGE $MNTPOINT $IMAGE +rm -rf $MNTIMAGE $IMAGE +if [ -n "$MNTPOINT" ]; then rm -rf $MNTPOINT ; fi exit $rc diff --git a/src/nash/mount_by_label.c b/src/nash/mount_by_label.c index 75ff9be4df..cf3c1f591e 100644 --- a/src/nash/mount_by_label.c +++ b/src/nash/mount_by_label.c @@ -1,300 +1,300 @@ -/* - * taken from util-linux 2.11g and hacked into nash - * - * mount_by_label.c - aeb - * - * 1999-02-22 Arkadiusz Mi¶kiewicz - * - added Native Language Support - * 2000-01-20 James Antill - * - Added error message if /proc/partitions cannot be opened - * 2000-05-09 Erik Troan - * - Added cache for UUID and disk labels - * 2000-11-07 Nathan Scott - * - Added XFS support - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "linux_fs.h" -#include "mount_by_label.h" - -#define PROC_PARTITIONS "/proc/partitions" -#define DEVLABELDIR "/dev" - -#define _(str) (str) - -static struct uuidCache_s { - struct uuidCache_s *next; - char uuid[16]; - char *device; - char *label; - int major, minor; -} *uuidCache = NULL; - -/* for now, only ext2, ext3 and xfs are supported */ -static int -get_label_uuid(const char *device, char **label, char *uuid) { - - /* start with ext2/3 and xfs tests, taken from mount_guess_fstype */ - /* should merge these later */ - int fd; - int rv = 1; - size_t namesize; - struct ext2_super_block e2sb; - struct xfs_super_block xfsb; - - fd = open(device, O_RDONLY); - if (fd < 0) - return rv; - - if (lseek(fd, 1024, SEEK_SET) == 1024 - && read(fd, (char *) &e2sb, sizeof(e2sb)) == sizeof(e2sb) - && (ext2magic(e2sb) == EXT2_SUPER_MAGIC)) { - memcpy(uuid, e2sb.s_uuid, sizeof(e2sb.s_uuid)); - namesize = sizeof(e2sb.s_volume_name); - if ((*label = calloc(namesize + 1, 1)) != NULL) - memcpy(*label, e2sb.s_volume_name, namesize); - rv = 0; - } - else if (lseek(fd, 0, SEEK_SET) == 0 - && read(fd, (char *) &xfsb, sizeof(xfsb)) == sizeof(xfsb) - && (strncmp(xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0)) { - memcpy(uuid, xfsb.s_uuid, sizeof(xfsb.s_uuid)); - namesize = sizeof(xfsb.s_fname); - if ((*label = calloc(namesize + 1, 1)) != NULL) - memcpy(*label, xfsb.s_fname, namesize); - rv = 0; - } - - close(fd); - return rv; -} - -static void -uuidcache_addentry(char * device, int major, int minor, char *label, char *uuid) { - struct uuidCache_s *last; - - if (!uuidCache) { - last = uuidCache = malloc(sizeof(*uuidCache)); - } else { - for (last = uuidCache; last->next; last = last->next) ; - last->next = malloc(sizeof(*uuidCache)); - last = last->next; - } - last->next = NULL; - last->label = label; - last->device = device; - last->major = major; - last->minor = minor; - memcpy(last->uuid, uuid, sizeof(last->uuid)); -} - -static void -uuidcache_init(void) { - char line[100]; - char *s; - int ma, mi, sz; - static char ptname[100]; - FILE *procpt; - char uuid[16], *label; - char device[110]; - int firstPass; - int handleOnFirst; - char * chptr, * endptr; - - if (uuidCache) - return; - - procpt = fopen(PROC_PARTITIONS, "r"); - if (!procpt) { - static int warn = 0; - if (!warn++) - fprintf (stderr, _("mount: could not open %s, so UUID and LABEL " - "conversion cannot be done.\n"), - PROC_PARTITIONS); - return; - } - - for (firstPass = 1; firstPass >= 0; firstPass--) { - fseek(procpt, 0, SEEK_SET); - - while (fgets(line, sizeof(line), procpt)) { - /* The original version of this code used sscanf, but - diet's sscanf is quite limited */ - chptr = line; - if (*chptr++ != ' ') continue; - - ma = strtol(chptr, &endptr, 0); - if (endptr == chptr) continue; - while (isspace(*endptr)) endptr++; - chptr = endptr; - - mi = strtol(chptr, &endptr, 0); - if (endptr == chptr) continue; - while (isspace(*endptr)) endptr++; - chptr = endptr; - - sz = strtol(chptr, &endptr, 0); - if (endptr == chptr) continue; - while (isspace(*endptr)) endptr++; - chptr = endptr; - - while (!isspace(*endptr) && *endptr != '\n') endptr++; - if (chptr == endptr) continue; - strncpy(ptname, chptr, endptr - chptr); - ptname[endptr - chptr] = '\0'; - - /* skip extended partitions (heuristic: size 1) */ - if (sz == 1) - continue; - - /* look only at md devices on first pass */ - handleOnFirst = !strncmp(ptname, "md", 2); - if (firstPass != handleOnFirst) - continue; - - /* skip entire disk (minor 0, 64, ... on ide; - 0, 16, ... on sd) */ - /* heuristic: partition name ends in a digit */ - - for(s = ptname; *s; s++); - - if (isdigit(s[-1])) { - char * ptr; - char * deviceDir; - int mustRemove = 0; - int mustRemoveDir = 0; - int i; - - sprintf(device, "%s/%s", DEVLABELDIR, ptname); - if (access(device, F_OK)) { - ptr = device; - i = 0; - while (*ptr) - if (*ptr++ == '/') - i++; - if (i > 2) { - deviceDir = alloca(strlen(device) + 1); - strcpy(deviceDir, device); - ptr = deviceDir + (strlen(device) - 1); - while (*ptr != '/') - *ptr-- = '\0'; - if (mkdir(deviceDir, 0644)) { - printf("mkdir: cannot create directory %s: %d\n", deviceDir, errno); - } else { - mustRemoveDir = 1; - } - } - - mknod(device, S_IFBLK | 0600, makedev(ma, mi)); - mustRemove = 1; - } - if (!get_label_uuid(device, &label, uuid)) - uuidcache_addentry(strdup(device), ma, mi, - label, uuid); - - if (mustRemove) unlink(device); - if (mustRemoveDir) rmdir(deviceDir); - } - } - } - - fclose(procpt); -} - -#define UUID 1 -#define VOL 2 - -static char * -get_spec_by_x(int n, const char *t, int * majorPtr, int * minorPtr) { - struct uuidCache_s *uc; - - uuidcache_init(); - uc = uuidCache; - - while(uc) { - switch (n) { - case UUID: - if (!memcmp(t, uc->uuid, sizeof(uc->uuid))) { - *majorPtr = uc->major; - *minorPtr = uc->minor; - return uc->device; - } - break; - case VOL: - if (!strcmp(t, uc->label)) { - *majorPtr = uc->major; - *minorPtr = uc->minor; - return uc->device; - } - break; - } - uc = uc->next; - } - return NULL; -} - -static unsigned char -fromhex(char c) { - if (isdigit(c)) - return (c - '0'); - else if (islower(c)) - return (c - 'a' + 10); - else - return (c - 'A' + 10); -} - -char * -get_spec_by_uuid(const char *s, int * major, int * minor) { - unsigned char uuid[16]; - int i; - - if (strlen(s) != 36 || - s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-') - goto bad_uuid; - for (i=0; i<16; i++) { - if (*s == '-') s++; - if (!isxdigit(s[0]) || !isxdigit(s[1])) - goto bad_uuid; - uuid[i] = ((fromhex(s[0])<<4) | fromhex(s[1])); - s += 2; - } - return get_spec_by_x(UUID, uuid, major, minor); - - bad_uuid: - fprintf(stderr, _("mount: bad UUID")); - return 0; -} - -char * -get_spec_by_volume_label(const char *s, int * major, int * minor) { - return get_spec_by_x(VOL, s, major, minor); -} - -int display_uuid_cache(void) { - struct uuidCache_s * u; - int i; - - uuidcache_init(); - - u = uuidCache; - while (u) { - printf("%s %s ", u->device, u->label); - for (i = 0; i < sizeof(u->uuid); i++) { - if (i == 4 || i == 6 || i == 8 || i == 10) - printf("-"); - printf("%x", u->uuid[i] & 0xff); - } - printf("\n"); - u = u->next; - } - - return 0; -} - +/* + * taken from util-linux 2.11g and hacked into nash + * + * mount_by_label.c - aeb + * + * 1999-02-22 Arkadiusz Mi¶kiewicz + * - added Native Language Support + * 2000-01-20 James Antill + * - Added error message if /proc/partitions cannot be opened + * 2000-05-09 Erik Troan + * - Added cache for UUID and disk labels + * 2000-11-07 Nathan Scott + * - Added XFS support + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "linux_fs.h" +#include "mount_by_label.h" + +#define PROC_PARTITIONS "/proc/partitions" +#define DEVLABELDIR "/dev" + +#define _(str) (str) + +static struct uuidCache_s { + struct uuidCache_s *next; + char uuid[16]; + char *device; + char *label; + int major, minor; +} *uuidCache = NULL; + +/* for now, only ext2, ext3 and xfs are supported */ +static int +get_label_uuid(const char *device, char **label, char *uuid) { + + /* start with ext2/3 and xfs tests, taken from mount_guess_fstype */ + /* should merge these later */ + int fd; + int rv = 1; + size_t namesize; + struct ext2_super_block e2sb; + struct xfs_super_block xfsb; + + fd = open(device, O_RDONLY); + if (fd < 0) + return rv; + + if (lseek(fd, 1024, SEEK_SET) == 1024 + && read(fd, (char *) &e2sb, sizeof(e2sb)) == sizeof(e2sb) + && (ext2magic(e2sb) == EXT2_SUPER_MAGIC)) { + memcpy(uuid, e2sb.s_uuid, sizeof(e2sb.s_uuid)); + namesize = sizeof(e2sb.s_volume_name); + if ((*label = calloc(namesize + 1, 1)) != NULL) + memcpy(*label, e2sb.s_volume_name, namesize); + rv = 0; + } + else if (lseek(fd, 0, SEEK_SET) == 0 + && read(fd, (char *) &xfsb, sizeof(xfsb)) == sizeof(xfsb) + && (strncmp((char *)xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0)) { + memcpy(uuid, xfsb.s_uuid, sizeof(xfsb.s_uuid)); + namesize = sizeof(xfsb.s_fname); + if ((*label = calloc(namesize + 1, 1)) != NULL) + memcpy(*label, xfsb.s_fname, namesize); + rv = 0; + } + + close(fd); + return rv; +} + +static void +uuidcache_addentry(char * device, int major, int minor, char *label, char *uuid) { + struct uuidCache_s *last; + + if (!uuidCache) { + last = uuidCache = malloc(sizeof(*uuidCache)); + } else { + for (last = uuidCache; last->next; last = last->next) ; + last->next = malloc(sizeof(*uuidCache)); + last = last->next; + } + last->next = NULL; + last->label = label; + last->device = device; + last->major = major; + last->minor = minor; + memcpy(last->uuid, uuid, sizeof(last->uuid)); +} + +static void +uuidcache_init(void) { + char line[100]; + char *s; + int ma, mi, sz; + static char ptname[100]; + FILE *procpt; + char uuid[16], *label; + char device[110]; + int firstPass; + int handleOnFirst; + char * chptr, * endptr; + + if (uuidCache) + return; + + procpt = fopen(PROC_PARTITIONS, "r"); + if (!procpt) { + static int warn = 0; + if (!warn++) + fprintf (stderr, _("mount: could not open %s, so UUID and LABEL " + "conversion cannot be done.\n"), + PROC_PARTITIONS); + return; + } + + for (firstPass = 1; firstPass >= 0; firstPass--) { + fseek(procpt, 0, SEEK_SET); + + while (fgets(line, sizeof(line), procpt)) { + /* The original version of this code used sscanf, but + diet's sscanf is quite limited */ + chptr = line; + if (*chptr++ != ' ') continue; + + ma = strtol(chptr, &endptr, 0); + if (endptr == chptr) continue; + while (isspace(*endptr)) endptr++; + chptr = endptr; + + mi = strtol(chptr, &endptr, 0); + if (endptr == chptr) continue; + while (isspace(*endptr)) endptr++; + chptr = endptr; + + sz = strtol(chptr, &endptr, 0); + if (endptr == chptr) continue; + while (isspace(*endptr)) endptr++; + chptr = endptr; + + while (!isspace(*endptr) && *endptr != '\n') endptr++; + if (chptr == endptr) continue; + strncpy(ptname, chptr, endptr - chptr); + ptname[endptr - chptr] = '\0'; + + /* skip extended partitions (heuristic: size 1) */ + if (sz == 1) + continue; + + /* look only at md devices on first pass */ + handleOnFirst = !strncmp(ptname, "md", 2); + if (firstPass != handleOnFirst) + continue; + + /* skip entire disk (minor 0, 64, ... on ide; + 0, 16, ... on sd) */ + /* heuristic: partition name ends in a digit */ + + for(s = ptname; *s; s++); + + if (isdigit(s[-1])) { + char * ptr; + char * deviceDir = NULL; + int mustRemove = 0; + int mustRemoveDir = 0; + int i; + + sprintf(device, "%s/%s", DEVLABELDIR, ptname); + if (access(device, F_OK)) { + ptr = device; + i = 0; + while (*ptr) + if (*ptr++ == '/') + i++; + if (i > 2) { + deviceDir = alloca(strlen(device) + 1); + strcpy(deviceDir, device); + ptr = deviceDir + (strlen(device) - 1); + while (*ptr != '/') + *ptr-- = '\0'; + if (mkdir(deviceDir, 0644)) { + printf("mkdir: cannot create directory %s: %d\n", deviceDir, errno); + } else { + mustRemoveDir = 1; + } + } + + mknod(device, S_IFBLK | 0600, makedev(ma, mi)); + mustRemove = 1; + } + if (!get_label_uuid(device, &label, uuid)) + uuidcache_addentry(strdup(device), ma, mi, + label, uuid); + + if (mustRemove) unlink(device); + if (mustRemoveDir) rmdir(deviceDir); + } + } + } + + fclose(procpt); +} + +#define UUID 1 +#define VOL 2 + +static char * +get_spec_by_x(int n, const char *t, int * majorPtr, int * minorPtr) { + struct uuidCache_s *uc; + + uuidcache_init(); + uc = uuidCache; + + while(uc) { + switch (n) { + case UUID: + if (!memcmp(t, uc->uuid, sizeof(uc->uuid))) { + *majorPtr = uc->major; + *minorPtr = uc->minor; + return uc->device; + } + break; + case VOL: + if (!strcmp(t, uc->label)) { + *majorPtr = uc->major; + *minorPtr = uc->minor; + return uc->device; + } + break; + } + uc = uc->next; + } + return NULL; +} + +static unsigned char +fromhex(char c) { + if (isdigit(c)) + return (c - '0'); + else if (islower(c)) + return (c - 'a' + 10); + else + return (c - 'A' + 10); +} + +char * +get_spec_by_uuid(const char *s, int * major, int * minor) { + unsigned char uuid[16]; + int i; + + if (strlen(s) != 36 || + s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-') + goto bad_uuid; + for (i=0; i<16; i++) { + if (*s == '-') s++; + if (!isxdigit(s[0]) || !isxdigit(s[1])) + goto bad_uuid; + uuid[i] = ((fromhex(s[0])<<4) | fromhex(s[1])); + s += 2; + } + return get_spec_by_x(UUID, (char *)uuid, major, minor); + + bad_uuid: + fprintf(stderr, _("mount: bad UUID")); + return 0; +} + +char * +get_spec_by_volume_label(const char *s, int * major, int * minor) { + return get_spec_by_x(VOL, s, major, minor); +} + +int display_uuid_cache(void) { + struct uuidCache_s * u; + size_t i; + + uuidcache_init(); + + u = uuidCache; + while (u) { + printf("%s %s ", u->device, u->label); + for (i = 0; i < sizeof(u->uuid); i++) { + if (i == 4 || i == 6 || i == 8 || i == 10) + printf("-"); + printf("%x", u->uuid[i] & 0xff); + } + printf("\n"); + u = u->next; + } + + return 0; +} + diff --git a/src/nash/mount_by_label.h b/src/nash/mount_by_label.h index 21866bff16..8ea6b0347c 100644 --- a/src/nash/mount_by_label.h +++ b/src/nash/mount_by_label.h @@ -1,2 +1,2 @@ -char * get_spec_by_uuid(const char *uuid, int * major, int * minor); -char * get_spec_by_volume_label(const char *volumelabel, int * major, int * minor); +char * get_spec_by_uuid(const char *uuid, int * major, int * minor); +char * get_spec_by_volume_label(const char *volumelabel, int * major, int * minor); diff --git a/src/nash/name_to_dev_t.c b/src/nash/name_to_dev_t.c new file mode 100644 index 0000000000..e882804e31 --- /dev/null +++ b/src/nash/name_to_dev_t.c @@ -0,0 +1,139 @@ +#include +#include +#include +#include +#include +#include + +static dev_t try_name(char *name, int part) +{ + char path[64]; + char buf[32]; + int range; + dev_t res; + char *s; + int len; + int fd; + unsigned int maj, min; + + /* read device number from .../dev */ + + sprintf(path, "/sys/block/%s/dev", name); + fd = open(path, O_RDONLY); + if (fd < 0) + goto fail; + len = read(fd, buf, 32); + close(fd); + if (len <= 0 || len == 32 || buf[len - 1] != '\n') + goto fail; + buf[len - 1] = '\0'; + if (sscanf(buf, "%u:%u", &maj, &min) != 2) + goto fail; + res = makedev(maj, min); + if (maj != major(res) || min != minor(res)) + goto fail; + + /* if it's there and we are not looking for a partition - that's it */ + if (!part) + return res; + + /* otherwise read range from .../range */ + snprintf(path, 64, "/sys/block/%s/range", name); + fd = open(path, O_RDONLY); + if (fd < 0) + goto fail; + len = read(fd, buf, 32); + close(fd); + if (len <= 0 || len == 32 || buf[len - 1] != '\n') + goto fail; + buf[len - 1] = '\0'; + range = strtoul(buf, &s, 10); + if (*s) + goto fail; + + /* if partition is within range - we got it */ + if (part < range) + return res + part; +fail: + return 0; +} + +/* + * Convert a name into device number. We accept the following variants: + * + * 1) device number in hexadecimal represents itself + * 2) /dev/nfs represents Root_NFS (0xff) + * 3) /dev/ represents the device number of disk + * 4) /dev/ represents the device number + * of partition - device number of disk plus the partition number + * 5) /dev/p - same as the above, that form is + * used when disk name of partitioned disk ends on a digit. + * + * If name doesn't have fall into the categories above, we return 0. + * sysfs is used to check if something is a disk name - it has + * all known disks under bus/block/devices. If the disk name + * contains slashes, name of driverfs node has them replaced with + * bangs. try_name() does the actual checks, assuming that sysfs + * is mounted on /sys. + * + * Note that cases (1) and (2) are already handled by the kernel, + * so we can ifdef them out, provided that we check real-root-dev + * first. + */ + +dev_t name_to_dev_t(char *name) +{ + char s[32]; + char *p; + dev_t res = 0; + int part; + + if (strncmp(name, "/dev/", 5) != 0) { +#if 1 /* kernel used to do this */ + unsigned maj, min; + + if (sscanf(name, "%u:%u", &maj, &min) == 2) { + res = makedev(maj, min); + if (maj != major(res) || min != minor(res)) + return 0; + } else { + res = strtoul(name, &p, 16); + if (*p) + return 0; + } +#endif + return res; + } + + name += 5; + +#if 1 /* kernel used to do this */ + if (strcmp(name, "nfs") == 0) + return makedev(0, 255); +#endif + + if (strlen(name) > 31) + return 0; + strcpy(s, name); + for (p = s; *p; p++) + if (*p == '/') + *p = '!'; + res = try_name(s, 0); + if (res) + return res; + + while (p > s && isdigit(p[-1])) + p--; + if (p == s || !*p || *p == '0') + return 0; + part = strtoul(p, NULL, 10); + *p = '\0'; + res = try_name(s, part); + if (res) + return res; + + if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p') + return 0; + p[-1] = '\0'; + return try_name(s, part); +} diff --git a/src/nash/nash.8 b/src/nash/nash.8 index f895ffa454..73ac16bfa0 100644 --- a/src/nash/nash.8 +++ b/src/nash/nash.8 @@ -1,5 +1,4 @@ -.TH NASH 8 "Sat Mar 27 1999" -.UC 4 +.TH NASH 8 "Mon Aug 02 2004" .SH NAME nash \- script interpretor to interpret linuxrc images .SH SYNOPSIS @@ -69,6 +68,12 @@ Creates a device inode for \fIpath\fR. This is identical to \fBmkdev\fR(1) which the exceptions that it will not create named pipes and if the directories in \fIpath\fR do not exist they will be automatically created. +.TP +\fBmkdmnod\fR +Creates a device inode for the device mapper control inode as +\fI/dev/mapper/control\fR. If it already exists with the correct +major/minor, it will not be recreated. + .TP \fBmkrootdev \fIpath\fR Makes \fIpath\fR a block inode for the device which should be mounted @@ -93,15 +98,33 @@ The \fBdefaults\fR mount option is silently ignored. Makes the filesystem mounted at \fInewrootpath\fR the new root filesystem, and mounts the current root filesystem as \fIoldrootpath\fR. +.TP +\fBreadlink \fIpath\fR +Displays the value of the symbolic link \fIpath\fR. + .TP \fBraidautorun \fImddevice\fR Runs raid autodetection on all raid-typed partitions. \fImddevice\fR must be a raid device (any will do). +.TP +\fBsetquiet\fR +Cause any later echos in this script to not be displayed. + .TP \fBshowlabels\fR Display a table of devices, their filesystem labels, and their uuids. +.TP +\fBsleep \fInum\fR +Sleep for \fInum\fR seconds + +.TP +\fBswitchroot \fInewrootpath\fR +Makes the filesystem mounted at \fInewrootpath\fR the new root +filesystem by moving the mountpoint. This will only work in 2.6 or +later kernels. + .TP \fBumount \fIpath\fR Unmounts the filesystem mounted at \fIpath\fR. diff --git a/src/nash/nash.c b/src/nash/nash.c index cfde50c0bd..42525b5a01 100644 --- a/src/nash/nash.c +++ b/src/nash/nash.c @@ -1,1230 +1,1712 @@ -/* - * nash.c - * - * Simple code to load modules, mount root, and get things going. Uses - * dietlibc to keep things small. - * - * Erik Troan (ewt@redhat.com) - * - * Copyright 2002 Red Hat Software - * - * This software may be freely redistributed under the terms of the GNU - * public license. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -/* We internalize losetup, mount, raidautorun, and echo commands. Other - commands are run from the filesystem. Comments and blank lines work as - well, argument parsing is screwy. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "mount_by_label.h" - -/* Need to tell loop.h what the actual dev_t type is. */ -#undef dev_t -#if defined(__alpha) || (defined(__sparc__) && defined(__arch64__)) -#define dev_t unsigned int -#else -#define dev_t unsigned short -#endif -#include -#undef dev_t -#define dev_t dev_t - -#define syslog klogctl - -#include -#define MD_MAJOR 9 -#include - -#ifndef RAID_AUTORUN -#define RAID_AUTORUN _IO (MD_MAJOR, 0x14) -#endif - -#ifndef MS_REMOUNT -#define MS_REMOUNT 32 -#endif - -#ifdef USE_DIET -static inline _syscall2(int,pivot_root,const char *,one,const char *,two) -#endif - -#define MAX(a, b) ((a) > (b) ? a : b) - -int testing = 0, quiet = 0; - -#define PATH "/usr/bin:/bin:/sbin:/usr/sbin" - -char * env[] = { - "PATH=" PATH, - NULL -}; - -int smartmknod(char * device, mode_t mode, dev_t dev) { - char buf[256]; - char * end; - - strcpy(buf, device); - - end = buf; - while (*end) { - if (*end == '/') { - *end = '\0'; - if (access(buf, F_OK) && errno == ENOENT) - mkdir(buf, 0700); - *end = '/'; - } - - end++; - } - - return mknod(device, mode, dev); -} - -char * getArg(char * cmd, char * end, char ** arg) { - char quote = '\0'; - - if (cmd >= end) return NULL; - - while (isspace(*cmd) && cmd < end) cmd++; - if (cmd >= end) return NULL; - - if (*cmd == '"') - cmd++, quote = '"'; - else if (*cmd == '\'') - cmd++, quote = '\''; - - if (quote) { - *arg = cmd; - - /* This doesn't support \ escapes */ - while (cmd < end && *cmd != quote) cmd++; - - if (cmd == end) { - printf("error: quote mismatch for %s\n", *arg); - return NULL; - } - - *cmd = '\0'; - cmd++; - } else { - *arg = cmd; - while (!isspace(*cmd) && cmd < end) cmd++; - *cmd = '\0'; - } - - cmd++; - - while (isspace(*cmd)) cmd++; - - return cmd; -} - -int mountCommand(char * cmd, char * end) { - char * fsType = NULL; - char * device; - char * mntPoint; - char * deviceDir; - char * options = NULL; - int mustRemove = 0; - int mustRemoveDir = 0; - int rc; - int flags = MS_MGC_VAL; - char * newOpts; - - cmd = getArg(cmd, end, &device); - if (!cmd) { - printf("usage: mount [--ro] [-o ] -t \n"); - return 1; - } - - while (cmd && *device == '-') { - if (!strcmp(device, "--ro")) { - flags |= MS_RDONLY; - } else if (!strcmp(device, "-o")) { - cmd = getArg(cmd, end, &options); - if (!cmd) { - printf("mount: -o requires arguments\n"); - return 1; - } - } else if (!strcmp(device, "-t")) { - if (!(cmd = getArg(cmd, end, &fsType))) { - printf("mount: missing filesystem type\n"); - return 1; - } - } - - cmd = getArg(cmd, end, &device); - } - - if (!cmd) { - printf("mount: missing device\n"); - return 1; - } - - if (!(cmd = getArg(cmd, end, &mntPoint))) { - printf("mount: missing mount point\n"); - return 1; - } - - if (!fsType) { - printf("mount: filesystem type expected\n"); - return 1; - } - - if (cmd < end) { - printf("mount: unexpected arguments\n"); - return 1; - } - - /* need to deal with options */ - if (options) { - char * end; - char * start = options; - - newOpts = alloca(strlen(options) + 1); - *newOpts = '\0'; - - while (*start) { - end = strchr(start, ','); - if (!end) { - end = start + strlen(start); - } else { - *end = '\0'; - end++; - } - - if (!strcmp(start, "ro")) - flags |= MS_RDONLY; - else if (!strcmp(start, "rw")) - flags &= ~MS_RDONLY; - else if (!strcmp(start, "nosuid")) - flags |= MS_NOSUID; - else if (!strcmp(start, "suid")) - flags &= ~MS_NOSUID; - else if (!strcmp(start, "nodev")) - flags |= MS_NODEV; - else if (!strcmp(start, "dev")) - flags &= ~MS_NODEV; - else if (!strcmp(start, "noexec")) - flags |= MS_NOEXEC; - else if (!strcmp(start, "exec")) - flags &= ~MS_NOEXEC; - else if (!strcmp(start, "sync")) - flags |= MS_SYNCHRONOUS; - else if (!strcmp(start, "async")) - flags &= ~MS_SYNCHRONOUS; - else if (!strcmp(start, "nodiratime")) - flags |= MS_NODIRATIME; - else if (!strcmp(start, "diratime")) - flags &= ~MS_NODIRATIME; - else if (!strcmp(start, "noatime")) - flags |= MS_NOATIME; - else if (!strcmp(start, "atime")) - flags &= ~MS_NOATIME; - else if (!strcmp(start, "remount")) - flags |= MS_REMOUNT; - else if (!strcmp(start, "defaults")) - ; - else { - if (*newOpts) - strcat(newOpts, ","); - strcat(newOpts, start); - } - - start = end; - } - - options = newOpts; - } - - if (!strncmp("LABEL=", device, 6)) { - int major, minor; - char * devName; - char * ptr; - int i; - - devName = get_spec_by_volume_label(device + 6, &major, &minor); - - if (devName) { - device = devName; - if (access(device, F_OK)) { - ptr = device; - i = 0; - while (*ptr) - if (*ptr++ == '/') - i++; - if (i > 2) { - deviceDir = alloca(strlen(device) + 1); - strcpy(deviceDir, device); - ptr = deviceDir + (strlen(device) - 1); - while (*ptr != '/') - *ptr-- = '\0'; - if (mkdir(deviceDir, 0644)) { - printf("mkdir: cannot create directory %s\n", deviceDir); - } else { - mustRemoveDir = 1; - } - } - if (smartmknod(device, S_IFBLK | 0600, makedev(major, minor))) { - printf("mount: cannot create device %s (%d,%d)\n", - device, major, minor); - return 1; - } - mustRemove = 1; - } - } - } - - if (testing) { - printf("mount %s%s%s-t '%s' '%s' '%s' (%s%s%s%s%s%s%s)\n", - options ? "-o '" : "", - options ? options : "", - options ? "\' " : "", - fsType, device, mntPoint, - (flags & MS_RDONLY) ? "ro " : "", - (flags & MS_NOSUID) ? "nosuid " : "", - (flags & MS_NODEV) ? "nodev " : "", - (flags & MS_NOEXEC) ? "noexec " : "", - (flags & MS_SYNCHRONOUS) ? "sync " : "", - (flags & MS_REMOUNT) ? "remount " : "", - (flags & MS_NOATIME) ? "noatime " : "" - ); - } else { - if (mount(device, mntPoint, fsType, flags, options)) { - printf("mount: error %d mounting %s\n", errno, fsType); - rc = 1; - } - } - - if (mustRemove) unlink(device); - if (mustRemoveDir) rmdir(deviceDir); - - return rc; -} - -int otherCommand(char * bin, char * cmd, char * end, int doFork) { - char * args[128]; - char ** nextArg; - int pid; - int status; - char fullPath[255]; - const static char * sysPath = PATH; - const char * pathStart; - const char * pathEnd; - char * stdoutFile = NULL; - int stdoutFd = 0; - - nextArg = args; - - if (!strchr(bin, '/')) { - pathStart = sysPath; - while (*pathStart) { - pathEnd = strchr(pathStart, ':'); - - if (!pathEnd) pathEnd = pathStart + strlen(pathStart); - - strncpy(fullPath, pathStart, pathEnd - pathStart); - fullPath[pathEnd - pathStart] = '/'; - strcpy(fullPath + (pathEnd - pathStart + 1), bin); - - pathStart = pathEnd; - if (*pathStart) pathStart++; - - if (!access(fullPath, X_OK)) { - bin = fullPath; - break; - } - } - } - - *nextArg = bin; - - while (cmd && cmd < end) { - nextArg++; - cmd = getArg(cmd, end, nextArg); - } - - if (cmd) nextArg++; - *nextArg = NULL; - - /* if the next-to-last arg is a >, redirect the output properly */ - if (((nextArg - args) >= 2) && !strcmp(*(nextArg - 2), ">")) { - stdoutFile = *(nextArg - 1); - *(nextArg - 2) = NULL; - - stdoutFd = open(stdoutFile, O_CREAT | O_RDWR | O_TRUNC, 0600); - if (stdoutFd < 0) { - printf("nash: failed to open %s: %d\n", stdoutFile, errno); - return 1; - } - } - - if (testing) { - printf("%s ", bin); - nextArg = args + 1; - while (*nextArg) - printf(" '%s'", *nextArg++); - if (stdoutFile) - printf(" (> %s)", stdoutFile); - printf("\n"); - } else { - if (!doFork || !(pid = fork())) { - /* child */ - dup2(stdoutFd, 1); - execve(args[0], args, env); - printf("ERROR: failed in exec of %s\n", args[0]); - return 1; - } - - close(stdoutFd); - - wait4(-1, &status, 0, NULL); - if (!WIFEXITED(status) || WEXITSTATUS(status)) { - printf("ERROR: %s exited abnormally!\n", args[0]); - return 1; - } - } - - return 0; -} - -int execCommand(char * cmd, char * end) { - char * bin; - - if (!(cmd = getArg(cmd, end, &bin))) { - printf("exec: argument expected\n"); - return 1; - } - - return otherCommand(bin, cmd, end, 0); -} - -int losetupCommand(char * cmd, char * end) { - char * device; - char * file; - int fd; - struct loop_info loopInfo; - int dev; - - if (!(cmd = getArg(cmd, end, &device))) { - printf("losetup: missing device\n"); - return 1; - } - - if (!(cmd = getArg(cmd, end, &file))) { - printf("losetup: missing file\n"); - return 1; - } - - if (cmd < end) { - printf("losetup: unexpected arguments\n"); - return 1; - } - - if (testing) { - printf("losetup '%s' '%s'\n", device, file); - } else { - dev = open(device, O_RDWR, 0); - if (dev < 0) { - printf("losetup: failed to open %s: %d\n", device, errno); - return 1; - } - - fd = open(file, O_RDWR, 0); - if (fd < 0) { - printf("losetup: failed to open %s: %d\n", file, errno); - close(dev); - return 1; - } - - if (ioctl(dev, LOOP_SET_FD, (long) fd)) { - printf("losetup: LOOP_SET_FD failed: %d\n", errno); - close(dev); - close(fd); - return 1; - } - - close(fd); - - memset(&loopInfo, 0, sizeof(loopInfo)); - strcpy(loopInfo.lo_name, file); - - if (ioctl(dev, LOOP_SET_STATUS, &loopInfo)) - printf("losetup: LOOP_SET_STATUS failed: %d\n", errno); - - close(dev); - } - - return 0; -} - -int raidautorunCommand(char * cmd, char * end) { - char * device; - int fd; - - if (!(cmd = getArg(cmd, end, &device))) { - printf("raidautorun: raid device expected as first argument\n"); - return 1; - } - - if (cmd < end) { - printf("raidautorun: unexpected arguments\n"); - return 1; - } - - fd = open(device, O_RDWR, 0); - if (fd < 0) { - printf("raidautorun: failed to open %s: %d\n", device, errno); - return 1; - } - - if (ioctl(fd, RAID_AUTORUN, 0)) { - printf("raidautorun: RAID_AUTORUN failed: %d\n", errno); - close(fd); - return 1; - } - - close(fd); - return 0; -} - -static int my_pivot_root(char * one, char * two) { -#ifdef USE_DIET - return pivot_root(one, two); -#else - return syscall(__NR_pivot_root, one, two); -#endif -} - -int pivotrootCommand(char * cmd, char * end) { - char * new; - char * old; - - if (!(cmd = getArg(cmd, end, &new))) { - printf("pivotroot: new root mount point expected\n"); - return 1; - } - - if (!(cmd = getArg(cmd, end, &old))) { - printf("pivotroot: old root mount point expected\n"); - return 1; - } - - if (cmd < end) { - printf("pivotroot: unexpected arguments\n"); - return 1; - } - - if (my_pivot_root(new, old)) { - printf("pivotroot: pivot_root(%s,%s) failed: %d\n", new, old, errno); - return 1; - } - - return 0; -} - -int echoCommand(char * cmd, char * end) { - char * args[256]; - char ** nextArg = args; - int outFd = 1; - int num = 0; - int i; - - if (testing && !quiet) { - printf("(echo) "); - fflush(stdout); - } - - while ((cmd = getArg(cmd, end, nextArg))) - nextArg++, num++; - - if ((nextArg - args >= 2) && !strcmp(*(nextArg - 2), ">")) { - outFd = open(*(nextArg - 1), O_RDWR | O_CREAT | O_TRUNC, 0644); - if (outFd < 0) { - printf("echo: cannot open %s for write: %d\n", - *(nextArg - 1), errno); - return 1; - } - - num -= 2; - } - - for (i = 0; i < num;i ++) { - if (i) - write(outFd, " ", 1); - write(outFd, args[i], strlen(args[i])); - } - - write(outFd, "\n", 1); - - if (outFd != 1) close(outFd); - - return 0; -} - -int umountCommand(char * cmd, char * end) { - char * path; - - if (!(cmd = getArg(cmd, end, &path))) { - printf("umount: path expected\n"); - return 1; - } - - if (cmd < end) { - printf("umount: unexpected arguments\n"); - return 1; - } - - if (umount(path)) { - printf("umount %s failed: %d\n", path, errno); - return 1; - } - - return 0; -} - -int mkrootdevCommand(char * cmd, char * end) { - char * path; - char * start, * chptr; - unsigned int devNum = 0; - int fd; - int i; - char buf[1024]; - int major, minor; - - if (!(cmd = getArg(cmd, end, &path))) { - printf("mkrootdev: path expected\n"); - return 1; - } - - if (cmd < end) { - printf("mkrootdev: unexpected arguments\n"); - return 1; - } - - fd = open("/proc/cmdline", O_RDONLY, 0); - if (fd < 0) { - printf("mkrootdev: failed to open /proc/cmdline: %d\n", errno); - return 1; - } - - i = read(fd, buf, sizeof(buf)); - if (i < 0) { - printf("mkrootdev: failed to read /proc/cmdline: %d\n", errno); - close(fd); - return 1; - } - - close(fd); - buf[i - 1] = '\0'; - - start = buf; - while (*start && isspace(*start)) start++; - while (*start && strncmp(start, "root=", 5)) { - while (*start && !isspace(*start)) start++; - while (*start && isspace(*start)) start++; - } - - start += 5; - chptr = start; - while (*chptr && !isspace(*chptr)) chptr++; - *chptr = '\0'; - - if (!strncmp(start, "LABEL=", 6)) { - if (get_spec_by_volume_label(start + 6, &major, &minor)) { - if (smartmknod(path, S_IFBLK | 0600, makedev(major, minor))) { - printf("mount: cannot create device %s (%d,%d)\n", - path, major, minor); - return 1; - } - - return 0; - } - - printf("mkrootdev: label %s not found\n", start + 6); - - return 1; - } - - fd = open("/proc/sys/kernel/real-root-dev", O_RDONLY, 0); - if (fd < 0) { - printf("mkrootdev: failed to open /proc/sys/kernel/real-root-dev: %d\n", errno); - return 1; - } - - i = read(fd, buf, sizeof(buf)); - if (i < 0) { - printf("mkrootdev: failed to read real-root-dev: %d\n", errno); - close(fd); - return 1; - } - - close(fd); - buf[i - 1] = '\0'; - - devNum = atoi(buf); - if (devNum < 0) { - printf("mkrootdev: bad device %s\n", buf); - return 1; - } - - if (smartmknod(path, S_IFBLK | 0700, devNum)) { - printf("mkrootdev: mknod failed: %d\n", errno); - return 1; - } - - return 0; -} - -int mkdirCommand(char * cmd, char * end) { - char * dir; - int ignoreExists = 0; - - cmd = getArg(cmd, end, &dir); - - if (cmd && !strcmp(dir, "-p")) { - ignoreExists = 1; - cmd = getArg(cmd, end, &dir); - } - - if (!cmd) { - printf("mkdir: directory expected\n"); - return 1; - } - - if (mkdir(dir, 0755)) { - if (!ignoreExists && errno == EEXIST) { - printf("mkdir: failed to create %s: %d\n", dir, errno); - return 1; - } - } - - return 0; -} - -int accessCommand(char * cmd, char * end) { - char * permStr; - int perms = 0; - char * file; - - cmd = getArg(cmd, end, &permStr); - if (cmd) cmd = getArg(cmd, end, &file); - - if (!cmd || *permStr != '-') { - printf("usage: access -[perm] file\n"); - return 1; - } - - permStr++; - while (*permStr) { - switch (*permStr) { - case 'r': perms |= R_OK; break; - case 'w': perms |= W_OK; break; - case 'x': perms |= X_OK; break; - case 'f': perms |= F_OK; break; - default: - printf("perms must be -[r][w][x][f]\n"); - return 1; - } - - permStr++; - } - - if (access(file, perms)) - return 1; - - return 0; -} - -int sleepCommand(char * cmd, char * end) { - char *delaystr; - int delay; - - if (!(cmd = getArg(cmd, end, &delaystr))) { - printf("sleep: delay expected\n"); - return 1; - } - - delay = atoi(delaystr); - sleep(delay); - - return 0; -} - -int readlinkCommand(char * cmd, char * end) { - char * path; - char * buf, * respath, * fullpath; - struct stat sb; - - if (!(cmd = getArg(cmd, end, &path))) { - printf("readlink: file expected\n"); - return 1; - } - - if (lstat(path, &sb) == -1) { - fprintf(stderr, "unable to stat %s: %d\n", path, errno); - return 1; - } - - if (!S_ISLNK(sb.st_mode)) { - printf("%s\n", path); - return 0; - } - - buf = malloc(512); - if (readlink(path, buf, 512) == -1) { - fprintf(stderr, "error readlink %s: %d\n", path, errno); - return 1; - } - - /* symlink is absolute */ - if (buf[0] == '/') { - printf("%s\n", buf); - return 0; - } - - /* nope, need to handle the relative symlink case too */ - respath = strrchr(path, '/'); - if (respath) { - *respath = '\0'; - } - - fullpath = malloc(512); - /* and normalize it */ - snprintf(fullpath, 512, "%s/%s", path, buf); - respath = malloc(PATH_MAX); - if (!(respath = realpath(fullpath, respath))) { - fprintf(stderr, "error realpath %s: %d\n", fullpath, errno); - return 1; - } - - printf("%s\n", respath); - return 0; -} - -int doFind(char * dirName, char * name) { - struct stat sb; - DIR * dir; - struct dirent * d; - char * strBuf = alloca(strlen(dirName) + 1024); - - if (!(dir = opendir(dirName))) { - fprintf(stderr, "error opening %s: %d\n", dirName, errno); - return 0; - } - - errno = 0; - while ((d = readdir(dir))) { - errno = 0; - - strcpy(strBuf, dirName); - strcat(strBuf, "/"); - strcat(strBuf, d->d_name); - - if (!strcmp(d->d_name, name)) - printf("%s\n", strBuf); - - if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) { - errno = 0; - continue; - } - - if (lstat(strBuf, &sb)) { - fprintf(stderr, "failed to stat %s: %d\n", strBuf, errno); - errno = 0; - continue; - } - - if (S_ISDIR(sb.st_mode)) - doFind(strBuf, name); - } - - if (errno) { - closedir(dir); - printf("error reading from %s: %d\n", dirName, errno); - return 1; - } - - closedir(dir); - - return 0; -} - -int findCommand(char * cmd, char * end) { - char * dir; - char * name; - - cmd = getArg(cmd, end, &dir); - if (cmd) cmd = getArg(cmd, end, &name); - if (cmd && strcmp(name, "-name")) { - printf("usage: find [path] -name [file]\n"); - return 1; - } - - if (cmd) cmd = getArg(cmd, end, &name); - if (!cmd) { - printf("usage: find [path] -name [file]\n"); - return 1; - } - - return doFind(dir, name); -} - -int findlodevCommand(char * cmd, char * end) { - char devName[20]; - int devNum; - int fd; - struct loop_info loopInfo; - char separator[2] = ""; - - if (*end != '\n') { - printf("usage: findlodev\n"); - return 1; - } - - if (!access("/dev/.devfsd", X_OK)) - strcpy(separator, "/"); - - for (devNum = 0; devNum < 256; devNum++) { - sprintf(devName, "/dev/loop%s%d", separator, devNum); - if ((fd = open(devName, O_RDONLY)) < 0) return 0; - - if (ioctl(fd, LOOP_GET_STATUS, &loopInfo)) { - close(fd); - printf("%s\n", devName); - return 0; - } - - close(fd); - } - - return 0; -} - -int mknodCommand(char * cmd, char * end) { - char * path, * type; - char * majorStr, * minorStr; - int major; - int minor; - char * chptr; - mode_t mode; - - cmd = getArg(cmd, end, &path); - cmd = getArg(cmd, end, &type); - cmd = getArg(cmd, end, &majorStr); - cmd = getArg(cmd, end, &minorStr); - if (!minorStr) { - printf("mknod: usage mknod [c|b] \n"); - return 1; - } - - if (!strcmp(type, "b")) { - mode = S_IFBLK; - } else if (!strcmp(type, "c")) { - mode = S_IFCHR; - } else { - printf("mknod: invalid type\n"); - return 1; - } - - major = strtol(majorStr, &chptr, 10); - if (*chptr) { - printf("invalid major number\n"); - return 1; - } - - minor = strtol(minorStr, &chptr, 10); - if (*chptr) { - printf("invalid minor number\n"); - return 1; - } - - if (smartmknod(path, mode | 0600, makedev(major, minor))) { - printf("mknod: failed to create %s: %d\n", path, errno); - return 1; - } - - return 0; -} - -int mkdevicesCommand(char * cmd, char * end) { - int fd; - char buf[32768]; - int i; - char * start, * chptr; - int major, minor; - char old; - char devName[128]; - char * prefix; - - if (!(cmd = getArg(cmd, end, &prefix))) { - printf("mkdevices: path expected\n"); - return 1; - } - - if (cmd < end) { - printf("mkdevices: unexpected arguments\n"); - return 1; - } - - if ((fd = open("/proc/partitions", O_RDONLY)) < 0) { - printf("mkrootdev: failed to open /proc/partitions: %d\n", errno); - return 1; - } - - i = read(fd, buf, sizeof(buf)); - if (i < 1) { - close(fd); - printf("failed to read /proc/partitions: %d\n", errno); - return 1; - } - buf[i] = '\0'; - close(fd); - - start = strchr(buf, '\n'); - if (start) { - start++; - start = strchr(buf, '\n'); - } - if (!start) return 1; - - start = start + 1; - while (*start) { - while (*start && isspace(*start)) start++; - major = strtol(start, &chptr, 10); - - if (start != chptr) { - start = chptr; - while (*start && isspace(*start)) start++; - minor = strtol(start, &chptr, 10); - - if (start != chptr) { - start = chptr; - while (*start && isspace(*start)) start++; - while (*start && !isspace(*start)) start++; - while (*start && isspace(*start)) start++; - - if (*start) { - - chptr = start; - while (!isspace(*chptr)) chptr++; - old = *chptr; - *chptr = '\0'; - - if (testing) { - printf("% 3d % 3d %s\n", major, minor, start); - } else { - char * ptr, * deviceDir; - int i; - - sprintf(devName, "%s/%s", prefix, start); - unlink(devName); - - ptr = devName; - i = 0; - while (*ptr) - if (*ptr++ == '/') - i++; - if (i > 2) { - deviceDir = alloca(strlen(devName) + 1); - strcpy(deviceDir, devName); - ptr = deviceDir + (strlen(devName) - 1); - while (*ptr != '/') - *ptr-- = '\0'; - if (access(deviceDir, X_OK) && mkdir(deviceDir, 0644)) { - printf("mkdir: cannot create directory %s: %d\n", deviceDir, errno); - } - } - if (smartmknod(devName, S_IFBLK | 0600, - makedev(major, minor))) { - printf("failed to create %s\n", devName); - } - } - - *chptr = old; - start = chptr; - } - - } - } - - start = strchr(start, '\n'); - if (!*start) return 1; - start = start + 1; - } - - return 0; -} - -int runStartup(int fd) { - char contents[32768]; - int i; - char * start, * end; - char * chptr; - int rc; - - i = read(fd, contents, sizeof(contents) - 1); - if (i == (sizeof(contents) - 1)) { - printf("Failed to read /startup.rc -- file too large.\n"); - return 1; - } - - contents[i] = '\0'; - - start = contents; - while (*start) { - while (isspace(*start) && *start && (*start != '\n')) start++; - - if (*start == '#') - while (*start && (*start != '\n')) start++; - - if (*start == '\n') { - start++; - continue; - } - - if (!*start) { - printf("(last line in /startup.rc is empty)\n"); - continue; - } - - /* start points to the beginning of the command */ - end = start + 1; - while (*end && (*end != '\n')) end++; - if (!*end) { - printf("(last line in /startup.rc missing \\n -- skipping)\n"); - start = end; - continue; - } - - /* end points to the \n at the end of the command */ - - chptr = start; - while (chptr < end && !isspace(*chptr)) chptr++; - - if (!strncmp(start, "mount", MAX(5, chptr - start))) - rc = mountCommand(chptr, end); - else if (!strncmp(start, "losetup", MAX(7, chptr - start))) - rc = losetupCommand(chptr, end); - else if (!strncmp(start, "echo", MAX(4, chptr - start))) - rc = echoCommand(chptr, end); - else if (!strncmp(start, "raidautorun", MAX(11, chptr - start))) - rc = raidautorunCommand(chptr, end); - else if (!strncmp(start, "pivot_root", MAX(10, chptr - start))) - rc = pivotrootCommand(chptr, end); - else if (!strncmp(start, "mkrootdev", MAX(9, chptr - start))) - rc = mkrootdevCommand(chptr, end); - else if (!strncmp(start, "umount", MAX(6, chptr - start))) - rc = umountCommand(chptr, end); - else if (!strncmp(start, "exec", MAX(4, chptr - start))) - rc = execCommand(chptr, end); - else if (!strncmp(start, "mkdir", MAX(5, chptr - start))) - rc = mkdirCommand(chptr, end); - else if (!strncmp(start, "access", MAX(6, chptr - start))) - rc = accessCommand(chptr, end); - else if (!strncmp(start, "find", MAX(4, chptr - start))) - rc = findCommand(chptr, end); - else if (!strncmp(start, "findlodev", MAX(7, chptr - start))) - rc = findlodevCommand(chptr, end); - else if (!strncmp(start, "showlabels", MAX(10, chptr-start))) - rc = display_uuid_cache(); - else if (!strncmp(start, "mkdevices", MAX(9, chptr-start))) - rc = mkdevicesCommand(chptr, end); - else if (!strncmp(start, "sleep", MAX(5, chptr-start))) - rc = sleepCommand(chptr, end); - else if (!strncmp(start, "mknod", MAX(5, chptr-start))) - rc = mknodCommand(chptr, end); - else if (!strncmp(start, "readlink", MAX(8, chptr-start))) - rc = readlinkCommand(chptr, end); - else { - *chptr = '\0'; - rc = otherCommand(start, chptr + 1, end, 1); - } - - start = end + 1; - } - - return rc; -} - -int main(int argc, char **argv) { - int fd = 0; - char * name; - int rc; - int force = 0; - - name = strrchr(argv[0], '/'); - if (!name) - name = argv[0]; - else - name++; - - if (!strcmp(name, "modprobe")) - exit(0); - - testing = (getppid() != 0) && (getppid() != 1); - argv++, argc--; - - while (argc && **argv == '-') { - if (!strcmp(*argv, "--force")) { - force = 1; - argv++, argc--; - testing = 0; - } else if (!strcmp(*argv, "--quiet")) { - quiet = 1; - argv++, argc--; - } else { - printf("unknown argument %s\n", *argv); - return 1; - } - } - - if (force && !quiet) - printf("(forcing normal run)\n"); - - if (testing && !quiet) - printf("(running in test mode).\n"); - - if (!quiet) printf("Red Hat nash version %s starting\n", VERSION); - - if (*argv) { - fd = open(*argv, O_RDONLY, 0); - if (fd < 0) { - printf("nash: cannot open %s: %d\n", *argv, errno); - exit(1); - } - } - - rc = runStartup(fd); - close(fd); - - return rc; -} +/* + * nash.c + * + * Simple code to load modules, mount root, and get things going. Uses + * dietlibc to keep things small. + * + * Erik Troan (ewt@redhat.com) + * Jeremy Katz (katzj@redhat.com) + * Peter Jones (pjones@redhat.com) + * + * Copyright 2002-2005 Red Hat Software + * + * This software may be freely redistributed under the terms of the GNU + * public license. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +/* We internalize losetup, mount, raidautorun, and echo commands. Other + commands are run from the filesystem. Comments and blank lines work as + well, argument parsing is screwy. */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "mount_by_label.h" + +/* Need to tell loop.h what the actual dev_t type is. */ +#undef dev_t +#if defined(__alpha) || (defined(__sparc__) && defined(__arch64__)) +#define dev_t unsigned int +#else +#define dev_t unsigned short +#endif +#include +#undef dev_t +#define dev_t dev_t + +#define syslog klogctl + +#include +#define MD_MAJOR 9 +#include + +#ifndef RAID_AUTORUN +#define RAID_AUTORUN _IO (MD_MAJOR, 0x14) +#endif + +#ifndef MS_REMOUNT +#define MS_REMOUNT 32 +#endif + +#ifndef MS_BIND +#define MS_BIND 4096 +#endif + +#ifndef MS_MOVE +#define MS_MOVE 8192 +#endif + +#ifndef MNT_FORCE +#define MNT_FORCE 0x1 +#endif + +#ifndef MNT_DETACH +#define MNT_DETACH 0x2 +#endif + +extern dev_t name_to_dev_t(char *name); +extern int display_uuid_cache(void); + +#define MAX(a, b) ((a) > (b) ? a : b) + +int testing = 0, quiet = 0, reallyquiet = 0; + +#define PATH "/usr/bin:/bin:/sbin:/usr/sbin" + +char * env[] = { + "PATH=" PATH, + "LVM_SUPPRESS_FD_WARNINGS=1", + NULL +}; + +int smartmknod(char * device, mode_t mode, dev_t dev) { + char buf[256]; + char * end; + + strncpy(buf, device, 256); + + end = buf; + while (*end) { + if (*end == '/') { + *end = '\0'; + if (access(buf, F_OK) && errno == ENOENT) + mkdir(buf, 0755); + *end = '/'; + } + + end++; + } + + return mknod(device, mode, dev); +} + +char * getArg(char * cmd, char * end, char ** arg) { + char quote = '\0'; + + if (!cmd || cmd >= end) return NULL; + + while (isspace(*cmd) && cmd < end) cmd++; + if (cmd >= end) return NULL; + + if (*cmd == '"') + cmd++, quote = '"'; + else if (*cmd == '\'') + cmd++, quote = '\''; + + if (quote) { + *arg = cmd; + + /* This doesn't support \ escapes */ + while (cmd < end && *cmd != quote) cmd++; + + if (cmd == end) { + printf("error: quote mismatch for %s\n", *arg); + return NULL; + } + + *cmd = '\0'; + cmd++; + } else { + *arg = cmd; + while (!isspace(*cmd) && cmd < end) cmd++; + *cmd = '\0'; + if (**arg == '$') + *arg = getenv(*arg+1); + if (*arg == NULL) + *arg = ""; + } + + cmd++; + + while (isspace(*cmd)) cmd++; + + return cmd; +} + +/* taken from anaconda/isys/probe.c */ +static int readFD (int fd, char **buf) +{ + char *p; + size_t size = 4096; + int s, filesize; + + *buf = malloc (size); + if (*buf == 0) + return -1; + + filesize = 0; + do { + p = &(*buf) [filesize]; + s = read (fd, p, 4096); + if (s < 0) + break; + filesize += s; + if (s != 4096) + break; + size += 4096; + *buf = realloc (*buf, size); + } while (1); + + if (filesize == 0 && s < 0) { + free (*buf); + *buf = NULL; + return -1; + } + + return filesize; +} + +#ifdef __powerpc__ +#define CMDLINESIZE 256 +#else +#define CMDLINESIZE 1024 +#endif + +/* get the contents of the kernel command line from /proc/cmdline */ +static char * getKernelCmdLine(void) { + int fd, i; + char * buf; + + fd = open("/proc/cmdline", O_RDONLY, 0); + if (fd < 0) { + printf("getKernelCmdLine: failed to open /proc/cmdline: %d\n", errno); + return NULL; + } + + buf = malloc(CMDLINESIZE); + if (!buf) + return buf; + + i = read(fd, buf, CMDLINESIZE); + if (i < 0) { + printf("getKernelCmdLine: failed to read /proc/cmdline: %d\n", errno); + close(fd); + return NULL; + } + + close(fd); + if (i == 0) + buf[0] = '\0'; + else + buf[i - 1] = '\0'; + return buf; +} + +/* get the start of a kernel arg "arg". returns everything after it + * (useful for things like getting the args to init=). so if you only + * want one arg, you need to terminate it at the n */ +static char * getKernelArg(char * arg) { + char * start, * cmdline; + + cmdline = start = getKernelCmdLine(); + if (start == NULL) return NULL; + while (*start) { + if (isspace(*start)) { + start++; + continue; + } + if (strncmp(start, arg, strlen(arg)) == 0) { + return start + strlen(arg); + } + while (*++start && !isspace(*start)) + ; + } + + return NULL; +} + +int mountCommand(char * cmd, char * end) { + char * fsType = NULL; + char * device; + char * mntPoint; + char * deviceDir = NULL; + char * options = NULL; + int mustRemove = 0; + int mustRemoveDir = 0; + int rc = 0; + int flags = MS_MGC_VAL; + char * newOpts; + + cmd = getArg(cmd, end, &device); + if (!cmd) { + printf("usage: mount [--ro] [-o ] -t \n"); + return 1; + } + + while (cmd && *device == '-') { + if (!strcmp(device, "--ro")) { + flags |= MS_RDONLY; + } else if (!strcmp(device, "--bind")) { + flags = MS_BIND; + fsType = "none"; + } else if (!strcmp(device, "-o")) { + cmd = getArg(cmd, end, &options); + if (!cmd) { + printf("mount: -o requires arguments\n"); + return 1; + } + } else if (!strcmp(device, "-t")) { + if (!(cmd = getArg(cmd, end, &fsType))) { + printf("mount: missing filesystem type\n"); + return 1; + } + } + + cmd = getArg(cmd, end, &device); + } + + if (!cmd) { + printf("mount: missing device\n"); + return 1; + } + + if (!(cmd = getArg(cmd, end, &mntPoint))) { + printf("mount: missing mount point\n"); + return 1; + } + + if (!fsType) { + printf("mount: filesystem type expected\n"); + return 1; + } + + if (cmd < end) { + printf("mount: unexpected arguments\n"); + return 1; + } + + /* need to deal with options */ + if (options) { + char * end; + char * start = options; + + newOpts = alloca(strlen(options) + 1); + *newOpts = '\0'; + + while (*start) { + end = strchr(start, ','); + if (!end) { + end = start + strlen(start); + } else { + *end = '\0'; + end++; + } + + if (!strcmp(start, "ro")) + flags |= MS_RDONLY; + else if (!strcmp(start, "rw")) + flags &= ~MS_RDONLY; + else if (!strcmp(start, "nosuid")) + flags |= MS_NOSUID; + else if (!strcmp(start, "suid")) + flags &= ~MS_NOSUID; + else if (!strcmp(start, "nodev")) + flags |= MS_NODEV; + else if (!strcmp(start, "dev")) + flags &= ~MS_NODEV; + else if (!strcmp(start, "noexec")) + flags |= MS_NOEXEC; + else if (!strcmp(start, "exec")) + flags &= ~MS_NOEXEC; + else if (!strcmp(start, "sync")) + flags |= MS_SYNCHRONOUS; + else if (!strcmp(start, "async")) + flags &= ~MS_SYNCHRONOUS; + else if (!strcmp(start, "nodiratime")) + flags |= MS_NODIRATIME; + else if (!strcmp(start, "diratime")) + flags &= ~MS_NODIRATIME; + else if (!strcmp(start, "noatime")) + flags |= MS_NOATIME; + else if (!strcmp(start, "atime")) + flags &= ~MS_NOATIME; + else if (!strcmp(start, "remount")) + flags |= MS_REMOUNT; + else if (!strcmp(start, "defaults")) + ; + else { + if (*newOpts) + strcat(newOpts, ","); + strcat(newOpts, start); + } + + start = end; + } + + options = newOpts; + } + + if (!strncmp("LABEL=", device, 6)) { + int major, minor; + char * devName; + char * ptr; + int i; + + devName = get_spec_by_volume_label(device + 6, &major, &minor); + + if (devName) { + device = devName; + if (access(device, F_OK)) { + ptr = device; + i = 0; + while (*ptr) + if (*ptr++ == '/') + i++; + if (i > 2) { + deviceDir = alloca(strlen(device) + 1); + strcpy(deviceDir, device); + ptr = deviceDir + (strlen(device) - 1); + while (*ptr != '/') + *ptr-- = '\0'; + if (mkdir(deviceDir, 0644)) { + printf("mkdir: cannot create directory %s\n", deviceDir); + } else { + mustRemoveDir = 1; + } + } + if (smartmknod(device, S_IFBLK | 0600, makedev(major, minor))) { + printf("mount: cannot create device %s (%d,%d)\n", + device, major, minor); + return 1; + } + mustRemove = 1; + } + } + } + + if (testing) { + printf("mount %s%s%s-t '%s' '%s' '%s' (%s%s%s%s%s%s%s)\n", + options ? "-o '" : "", + options ? options : "", + options ? "\' " : "", + fsType, device, mntPoint, + (flags & MS_RDONLY) ? "ro " : "", + (flags & MS_NOSUID) ? "nosuid " : "", + (flags & MS_NODEV) ? "nodev " : "", + (flags & MS_NOEXEC) ? "noexec " : "", + (flags & MS_SYNCHRONOUS) ? "sync " : "", + (flags & MS_REMOUNT) ? "remount " : "", + (flags & MS_NOATIME) ? "noatime " : "" + ); + } else { + if (mount(device, mntPoint, fsType, flags, options)) { + printf("mount: error %d mounting %s\n", errno, fsType); + rc = 1; + } + } + + if (mustRemove) unlink(device); + if (mustRemoveDir) rmdir(deviceDir); + + return rc; +} + +int otherCommand(char * bin, char * cmd, char * end, int doFork) { + char ** args; + char ** nextArg; + int pid, wpid; + int status; + char fullPath[255]; + static const char * sysPath = PATH; + const char * pathStart; + const char * pathEnd; + char * stdoutFile = NULL; + int stdoutFd = 0; + + args = (char **)malloc(sizeof(char *) * 128); + if (!args) + return 1; + nextArg = args; + + if (!strchr(bin, '/')) { + pathStart = sysPath; + while (*pathStart) { + pathEnd = strchr(pathStart, ':'); + + if (!pathEnd) pathEnd = pathStart + strlen(pathStart); + + strncpy(fullPath, pathStart, pathEnd - pathStart); + fullPath[pathEnd - pathStart] = '/'; + strcpy(fullPath + (pathEnd - pathStart + 1), bin); + + pathStart = pathEnd; + if (*pathStart) pathStart++; + + if (!access(fullPath, X_OK)) { + bin = fullPath; + break; + } + } + } + + *nextArg = strdup(bin); + + while (cmd && cmd < end) { + nextArg++; + cmd = getArg(cmd, end, nextArg); + } + + if (cmd) nextArg++; + *nextArg = NULL; + + /* if the next-to-last arg is a >, redirect the output properly */ + if (((nextArg - args) >= 2) && !strcmp(*(nextArg - 2), ">")) { + stdoutFile = *(nextArg - 1); + *(nextArg - 2) = NULL; + + stdoutFd = open(stdoutFile, O_CREAT | O_RDWR | O_TRUNC, 0600); + if (stdoutFd < 0) { + printf("nash: failed to open %s: %d\n", stdoutFile, errno); + return 1; + } + } + + if (testing) { + printf("%s ", bin); + nextArg = args + 1; + while (*nextArg) + printf(" '%s'", *nextArg++); + if (stdoutFile) + printf(" (> %s)", stdoutFile); + printf("\n"); + } else { + if (!doFork || !(pid = fork())) { + /* child */ + dup2(stdoutFd, 1); + execve(args[0], args, env); + printf("ERROR: failed in exec of %s\n", args[0]); + return 1; + } + + close(stdoutFd); + + for (;;) { + wpid = wait4(-1, &status, 0, NULL); + if (wpid == -1) { + printf("ERROR: Failed to wait for process %d\n", wpid); + } + + if (wpid != pid) + continue; + + if (!WIFEXITED(status) || WEXITSTATUS(status)) { + printf("ERROR: %s exited abnormally with value %d ! (pid %d)\n", args[0], WEXITSTATUS(status), pid); + return 1; + } + break; + } + } + + return 0; +} + +#ifdef DEBUG +static int lsdir(char *thedir, char * prefix) { + DIR * dir; + struct dirent * entry; + struct stat sb; + char * fn; + + if (!(dir = opendir(thedir))) { + printf("error opening %s: %d\n", thedir, errno); + return 1; + } + + fn = malloc(1024); + while ((entry = readdir(dir))) { + if (entry->d_name[0] == '.') + continue; + snprintf(fn, 1024, "%s/%s", thedir, entry->d_name); + stat(fn, &sb); + printf("%s%s", prefix, fn); + + if (S_ISDIR(sb.st_mode)) { + char * pfx; + pfx = malloc(strlen(prefix) + 3); + sprintf(pfx, "%s ", prefix); + printf("/\n"); + } else if (S_ISCHR(sb.st_mode)) { + printf(" c %d %d\n", major(sb.st_rdev), minor(sb.st_rdev)); + } else if (S_ISBLK(sb.st_mode)) { + printf(" b %d %d\n", major(sb.st_rdev), minor(sb.st_rdev)); + } else if (S_ISLNK(sb.st_mode)) { + char * target; + target = malloc(1024); + readlink(fn, target, 1024); + printf("->%s\n", target); + free(target); + } else { + printf("\n"); + } + } + return 0; +} + +int catCommand(char * cmd, char * end) { + char * file; + char * buf; + int fd; + + if (!(cmd = getArg(cmd, end, &file))) { + printf("cat: argument expected\n"); + return 1; + } + + if ((fd = open(file, O_RDONLY)) < 0) { + printf("cat: error opening %s: %d\n", file, errno); + return 1; + } + + buf = malloc(1024); + while (read(fd, buf, 1024) > 0) { + write(1, buf, 1024); + } + return 0; +} + +int lsCommand(char * cmd, char * end) { + char * dir; + + if (!(cmd = getArg(cmd, end, &dir))) { + printf("ls: argument expected\n"); + return 1; + } + + lsdir(dir, ""); + return 0; +} +#endif + +int execCommand(char * cmd, char * end) { + char * bin; + + if (!(cmd = getArg(cmd, end, &bin))) { + printf("exec: argument expected\n"); + return 1; + } + + return otherCommand(bin, cmd, end, 0); +} + +int losetupCommand(char * cmd, char * end) { + char * device; + char * file; + int fd; + struct loop_info loopInfo; + int dev; + + if (!(cmd = getArg(cmd, end, &device))) { + printf("losetup: missing device\n"); + return 1; + } + + if (!(cmd = getArg(cmd, end, &file))) { + printf("losetup: missing file\n"); + return 1; + } + + if (cmd < end) { + printf("losetup: unexpected arguments\n"); + return 1; + } + + if (testing) { + printf("losetup '%s' '%s'\n", device, file); + } else { + dev = open(device, O_RDWR, 0); + if (dev < 0) { + printf("losetup: failed to open %s: %d\n", device, errno); + return 1; + } + + fd = open(file, O_RDWR, 0); + if (fd < 0) { + printf("losetup: failed to open %s: %d\n", file, errno); + close(dev); + return 1; + } + + if (ioctl(dev, LOOP_SET_FD, (long) fd)) { + printf("losetup: LOOP_SET_FD failed: %d\n", errno); + close(dev); + close(fd); + return 1; + } + + close(fd); + + memset(&loopInfo, 0, sizeof(loopInfo)); + strcpy(loopInfo.lo_name, file); + + if (ioctl(dev, LOOP_SET_STATUS, &loopInfo)) + printf("losetup: LOOP_SET_STATUS failed: %d\n", errno); + + close(dev); + } + + return 0; +} + +#define RAID_MAJOR 9 +int raidautorunCommand(char * cmd, char * end) { + char * device; + int fd; + + if (!(cmd = getArg(cmd, end, &device))) { + printf("raidautorun: raid device expected as first argument\n"); + return 1; + } + + if (cmd < end) { + printf("raidautorun: unexpected arguments\n"); + return 1; + } + + /* with udev, the raid devices don't exist until they get started. + * this won't work so well with raidautorun. so, let's be smart + * and create them ourselves if we need to */ + if (access(device, R_OK & W_OK)) { + int minor; + if (sscanf(device, "/dev/md%d", &minor) != 1) { + printf("raidautorun: unable to autocreate %s\n", device); + return 1; + } + + if (smartmknod(device, S_IFBLK | 0600, makedev(RAID_MAJOR, minor))) { + printf("raidautorun: unable to autocreate %s\n", device); + return 1; + } + } + + fd = open(device, O_RDWR, 0); + if (fd < 0) { + printf("raidautorun: failed to open %s: %d\n", device, errno); + return 1; + } + + if (ioctl(fd, RAID_AUTORUN, 0)) { + printf("raidautorun: RAID_AUTORUN failed: %d\n", errno); + close(fd); + return 1; + } + + close(fd); + return 0; +} + +#ifdef USE_DIET +extern int pivot_root(char *, char *); +#endif + +static int my_pivot_root(char * one, char * two) { +#ifdef USE_DIET + return pivot_root(one, two); +#else + return syscall(__NR_pivot_root, one, two); +#endif +} + +int pivotrootCommand(char * cmd, char * end) { + char * new; + char * old; + + if (!(cmd = getArg(cmd, end, &new))) { + printf("pivotroot: new root mount point expected\n"); + return 1; + } + + if (!(cmd = getArg(cmd, end, &old))) { + printf("pivotroot: old root mount point expected\n"); + return 1; + } + + if (cmd < end) { + printf("pivotroot: unexpected arguments\n"); + return 1; + } + + if (my_pivot_root(new, old)) { + printf("pivotroot: pivot_root(%s,%s) failed: %d\n", new, old, errno); + return 1; + } + + return 0; +} + +#define MAX_INIT_ARGS 32 +/* 2.6 magic not-pivot-root but kind of similar stuff. + * This is based on code from klibc/utils/run_init.c + */ +int switchrootCommand(char * cmd, char * end) { + char * new; + const char * initprogs[] = { "/sbin/init", "/etc/init", + "/bin/init", "/bin/sh", NULL }; + char * init, * cmdline = NULL; + char ** initargs; + /* Don't try to unmount the old "/", there's no way to do it. */ + const char * umounts[] = { "/dev", "/proc", "/sys", NULL }; + int fd, i = 0; + int moveDev = 0; + + cmd = getArg(cmd, end, &new); + if (cmd) { + if (!strcmp(new, "--movedev")) + moveDev = 1; + cmd = getArg(cmd, end, &new); + } + + if (!cmd) { + printf("switchroot: new root mount point expected\n"); + return 1; + } + + if (chdir(new)) { + printf("switchroot: chdir(%s) failed: %d\n", new, errno); + return 1; + } + + init = getKernelArg("init="); + if (init == NULL) + cmdline = getKernelCmdLine(); + + if (moveDev) { + i = 1; + mount("/dev", "./dev", NULL, MS_MOVE, NULL); + } + + if ((fd = open("./dev/console", O_RDWR)) < 0) { + printf("ERROR opening /dev/console!!!!: %d\n", errno); + fd = 0; + } + + if (dup2(fd, 0) != 0) printf("error dup2'ing fd of %d to 0\n", fd); + if (dup2(fd, 1) != 1) printf("error dup2'ing fd of %d to 1\n", fd); + if (dup2(fd, 2) != 2) printf("error dup2'ing fd of %d to 2\n", fd); + if (fd > 2) + close(fd); + + fd = open("/", O_RDONLY); + for (; umounts[i] != NULL; i++) { + if (!quiet) printf("unmounting old %s\n", umounts[i]); + if (umount2(umounts[i], MNT_DETACH)) { + printf("ERROR unmounting old %s: %d\n", umounts[i], errno); + printf("forcing unmount of %s\n", umounts[i]); + umount2(umounts[i], MNT_FORCE); + } + } + i=0; + + if (mount(".", "/", NULL, MS_MOVE, NULL)) { + printf("switchroot: mount failed: %d\n", errno); + close(fd); + return 1; + } + + if (chroot(".") || chdir("/")) { + printf("switchroot: chroot() failed: %d\n", errno); + close(fd); + return 1; + } + + /* release the old "/" */ + close(fd); + + if (init == NULL) { + int j; + for (j = 0; initprogs[j] != NULL; j++) { + if (!access(initprogs[j], X_OK)) { + init = strdup(initprogs[j]); + break; + } + } + } + + initargs = (char **)malloc(sizeof(char *)*(MAX_INIT_ARGS+1)); + if (cmdline && init) { + initargs[i++] = strdup(init); + } else { + cmdline = init; + initargs[0] = NULL; + } + + if (cmdline != NULL) { + char * chptr, * start; + + start = chptr = cmdline; + for (; (i < MAX_INIT_ARGS) && (*start != '\0'); i++) { + while (*chptr && !isspace(*chptr)) chptr++; + if (*chptr != '\0') *(chptr++) = '\0'; + initargs[i] = strdup(start); + start = chptr; + } + } + + initargs[i] = NULL; + + if (access(initargs[0], X_OK)) { + printf("WARNING: can't access %s\n", initargs[0]); + } + execv(initargs[0], initargs); + printf("exec of init (%s) failed!!!: %d\n", initargs[0], errno); + return 1; +} + +int isEchoQuiet(int fd) { + if (!reallyquiet) return 0; + if (fd != 1) return 0; + return 1; +} + +int echoCommand(char * cmd, char * end) { + char * args[256]; + char ** nextArg = args; + int outFd = 1; + int num = 0; + int i; + int newline = 1; + int length = 0; + char *string; + + if (testing && !quiet) { + printf("(echo) "); + fflush(stdout); + } + + while ((cmd = getArg(cmd, end, nextArg))) { + if (!strncmp("-n", *nextArg, MAX(2, strlen(*nextArg)))) { + newline = 0; + } else { + length += strlen(*nextArg); + nextArg++, num++; + } + } + length += num + 1; + + if ((nextArg - args >= 2) && !strcmp(*(nextArg - 2), ">")) { + outFd = open(*(nextArg - 1), O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (outFd < 0) { + printf("echo: cannot open %s for write: %d\n", + *(nextArg - 1), errno); + return 1; + } + + newline = 0; + num -= 2; + } + string = (char *)malloc(length * sizeof(char)); + *string = '\0'; + for (i = 0; i < num;i ++) { + if (i) strcat(string, " "); + strncat(string, args[i], strlen(args[i])); + } + + if (newline) strcat(string, "\n"); + if (!isEchoQuiet(outFd)) write(outFd, string, strlen(string)); + + if (outFd != 1) close(outFd); + free(string); + + return 0; +} + +int umountCommand(char * cmd, char * end) { + char * path; + + if (!(cmd = getArg(cmd, end, &path))) { + printf("umount: path expected\n"); + return 1; + } + + if (cmd < end) { + printf("umount: unexpected arguments\n"); + return 1; + } + + if (umount(path)) { + printf("umount %s failed: %d\n", path, errno); + return 1; + } + + return 0; +} + +int mkrootdevCommand(char * cmd, char * end) { + char * path; + char *root, * chptr; + int devNum = 0; + int fd; + int i; + char buf[1024]; + int major, minor; + + if (!(cmd = getArg(cmd, end, &path))) { + printf("mkrootdev: path expected\n"); + return 1; + } + + if (cmd < end) { + printf("mkrootdev: unexpected arguments\n"); + return 1; + } + + root = getKernelArg("root="); + + if (root) { + chptr = root; + while (*chptr && !isspace(*chptr)) chptr++; + *chptr = '\0'; + } + + if (root && !access(root, R_OK)) { + if (!symlink(root, "/dev/root")) + return 0; + } + + if (root && !strncmp(root, "LABEL=", 6)) { + if (get_spec_by_volume_label(root + 6, &major, &minor)) { + if (smartmknod(path, S_IFBLK | 0600, makedev(major, minor))) { + printf("mount: cannot create device %s (%d,%d)\n", + path, major, minor); + return 1; + } + + return 0; + } + + printf("mkrootdev: label %s not found\n", root + 6); + + return 1; + } + + if (root && !strncmp(root, "UUID=", 5)) { + if (get_spec_by_uuid(root+5, &major, &minor)) { + if (smartmknod(path, S_IFBLK | 0600, makedev(major, minor))) { + printf("mount: cannot create device %s (%d,%d)\n", + path, major, minor); + return 1; + } + + return 0; + } + + printf("mkrootdev: UUID %s not found\n", root+5); + + return 1; + } + + fd = open("/proc/sys/kernel/real-root-dev", O_RDONLY, 0); + if (fd < 0) { + printf("mkrootdev: failed to open /proc/sys/kernel/real-root-dev: %d\n", errno); + return 1; + } + + i = read(fd, buf, sizeof(buf)); + if (i < 0) { + printf("mkrootdev: failed to read real-root-dev: %d\n", errno); + close(fd); + return 1; + } + + close(fd); + if (i == 0) + buf[i] = '\0'; + else + buf[i - 1] = '\0'; + + devNum = atoi(buf); + if (devNum < 0) { + printf("mkrootdev: bad device %s\n", buf); + return 1; + } + + if (!devNum && root) + devNum = name_to_dev_t(root); + + if (smartmknod(path, S_IFBLK | 0700, devNum)) { + printf("mkrootdev: mknod failed: %d\n", errno); + return 1; + } + + return 0; +} + +int mkdirCommand(char * cmd, char * end) { + char * dir; + int ignoreExists = 0; + + cmd = getArg(cmd, end, &dir); + + if (cmd && !strcmp(dir, "-p")) { + ignoreExists = 1; + cmd = getArg(cmd, end, &dir); + } + + if (!cmd) { + printf("mkdir: directory expected\n"); + return 1; + } + + if (mkdir(dir, 0755)) { + if (!ignoreExists && errno == EEXIST) { + printf("mkdir: failed to create %s: %d\n", dir, errno); + return 1; + } + } + + return 0; +} + +int accessCommand(char * cmd, char * end) { + char * permStr; + int perms = 0; + char * file = NULL; + + cmd = getArg(cmd, end, &permStr); + if (cmd) cmd = getArg(cmd, end, &file); + + if (!cmd || *permStr != '-') { + printf("usage: access -[perm] file\n"); + return 1; + } + + permStr++; + while (*permStr) { + switch (*permStr) { + case 'r': perms |= R_OK; break; + case 'w': perms |= W_OK; break; + case 'x': perms |= X_OK; break; + case 'f': perms |= F_OK; break; + default: + printf("perms must be -[r][w][x][f]\n"); + return 1; + } + + permStr++; + } + + if ((file == NULL) || (access(file, perms))) + return 1; + + return 0; +} + +int sleepCommand(char * cmd, char * end) { + char *delaystr; + int delay; + + if (!(cmd = getArg(cmd, end, &delaystr))) { + printf("sleep: delay expected\n"); + return 1; + } + + delay = atoi(delaystr); + sleep(delay); + + return 0; +} + +int readlinkCommand(char * cmd, char * end) { + char * path; + char * buf, * respath, * fullpath; + struct stat sb; + int rc = 0; + + if (!(cmd = getArg(cmd, end, &path))) { + printf("readlink: file expected\n"); + return 1; + } + + if (lstat(path, &sb) == -1) { + fprintf(stderr, "unable to stat %s: %d\n", path, errno); + return 1; + } + + if (!S_ISLNK(sb.st_mode)) { + printf("%s\n", path); + return 0; + } + + buf = malloc(512); + if (readlink(path, buf, 512) == -1) { + fprintf(stderr, "error readlink %s: %d\n", path, errno); + free(buf); + return 1; + } + + /* symlink is absolute */ + if (buf[0] == '/') { + printf("%s\n", buf); + free(buf); + return 0; + } + + /* nope, need to handle the relative symlink case too */ + respath = strrchr(path, '/'); + if (respath) { + *respath = '\0'; + } + + fullpath = malloc(512); + /* and normalize it */ + snprintf(fullpath, 512, "%s/%s", path, buf); + respath = malloc(PATH_MAX); + if (!(respath = realpath(fullpath, respath))) { + fprintf(stderr, "error realpath %s: %d\n", fullpath, errno); + rc = 1; + goto readlinkout; + } + + printf("%s\n", respath); + readlinkout: + free(buf); + free(respath); + free(fullpath); + return rc; +} + +int doFind(char * dirName, char * name) { + struct stat sb; + DIR * dir; + struct dirent * d; + char * strBuf = alloca(strlen(dirName) + 1024); + + if (!(dir = opendir(dirName))) { + fprintf(stderr, "error opening %s: %d\n", dirName, errno); + return 0; + } + + errno = 0; + while ((d = readdir(dir))) { + errno = 0; + + strcpy(strBuf, dirName); + strcat(strBuf, "/"); + strcat(strBuf, d->d_name); + + if (!strcmp(d->d_name, name)) + printf("%s\n", strBuf); + + if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) { + errno = 0; + continue; + } + + if (lstat(strBuf, &sb)) { + fprintf(stderr, "failed to stat %s: %d\n", strBuf, errno); + errno = 0; + continue; + } + + if (S_ISDIR(sb.st_mode)) + doFind(strBuf, name); + } + + if (errno) { + closedir(dir); + printf("error reading from %s: %d\n", dirName, errno); + return 1; + } + + closedir(dir); + + return 0; +} + +int findCommand(char * cmd, char * end) { + char * dir; + char * name; + + cmd = getArg(cmd, end, &dir); + if (cmd) cmd = getArg(cmd, end, &name); + if (cmd && strcmp(name, "-name")) { + printf("usage: find [path] -name [file]\n"); + return 1; + } + + if (cmd) cmd = getArg(cmd, end, &name); + if (!cmd) { + printf("usage: find [path] -name [file]\n"); + return 1; + } + + return doFind(dir, name); +} + +int findlodevCommand(char * cmd, char * end) { + char devName[20]; + int devNum; + int fd; + struct loop_info loopInfo; + char separator[2] = ""; + + if (*end != '\n') { + printf("usage: findlodev\n"); + return 1; + } + + if (!access("/dev/.devfsd", X_OK)) + strcpy(separator, "/"); + + for (devNum = 0; devNum < 256; devNum++) { + sprintf(devName, "/dev/loop%s%d", separator, devNum); + if ((fd = open(devName, O_RDONLY)) < 0) return 0; + + if (ioctl(fd, LOOP_GET_STATUS, &loopInfo)) { + close(fd); + printf("%s\n", devName); + return 0; + } + + close(fd); + } + + return 0; +} + +int mknodCommand(char * cmd, char * end) { + char * path, * type; + char * majorStr, * minorStr; + int major; + int minor; + char * chptr; + mode_t mode; + + cmd = getArg(cmd, end, &path); + cmd = getArg(cmd, end, &type); + cmd = getArg(cmd, end, &majorStr); + cmd = getArg(cmd, end, &minorStr); + if (!minorStr) { + printf("mknod: usage mknod [c|b] \n"); + return 1; + } + + if (!strcmp(type, "b")) { + mode = S_IFBLK; + } else if (!strcmp(type, "c")) { + mode = S_IFCHR; + } else { + printf("mknod: invalid type\n"); + return 1; + } + + major = strtol(majorStr, &chptr, 10); + if (*chptr) { + printf("invalid major number\n"); + return 1; + } + + minor = strtol(minorStr, &chptr, 10); + if (*chptr) { + printf("invalid minor number\n"); + return 1; + } + + if (smartmknod(path, mode | 0600, makedev(major, minor))) { + printf("mknod: failed to create %s: %d\n", path, errno); + return 1; + } + + return 0; +} + +int mkdevicesCommand(char * cmd, char * end) { + int fd; + char *buf; + int i; + char * start, * chptr; + int major, minor; + char old; + char devName[128]; + char * prefix; + + if (!(cmd = getArg(cmd, end, &prefix))) { + printf("mkdevices: path expected\n"); + return 1; + } + + if (cmd < end) { + printf("mkdevices: unexpected arguments\n"); + return 1; + } + + if ((fd = open("/proc/partitions", O_RDONLY)) < 0) { + printf("mkrootdev: failed to open /proc/partitions: %d\n", errno); + return 1; + } + + i = readFD(fd, &buf); + if (i < 1) { + close(fd); + printf("failed to read /proc/partitions: %d\n", errno); + return 1; + } + buf[i] = '\0'; + close(fd); + + start = strchr(buf, '\n'); + if (start) { + start++; + start = strchr(buf, '\n'); + } + if (!start) return 1; + + start = start + 1; + while (*start) { + while (*start && isspace(*start)) start++; + major = strtol(start, &chptr, 10); + + if (start != chptr) { + start = chptr; + while (*start && isspace(*start)) start++; + minor = strtol(start, &chptr, 10); + + if (start != chptr) { + start = chptr; + while (*start && isspace(*start)) start++; + while (*start && !isspace(*start)) start++; + while (*start && isspace(*start)) start++; + + if (*start) { + + chptr = start; + while (!isspace(*chptr)) chptr++; + old = *chptr; + *chptr = '\0'; + + if (testing) { + printf("% 3d % 3d %s\n", major, minor, start); + } else { + char * ptr, * deviceDir; + int i; + + sprintf(devName, "%s/%s", prefix, start); + unlink(devName); + + ptr = devName; + i = 0; + while (*ptr) + if (*ptr++ == '/') + i++; + if (i > 2) { + deviceDir = alloca(strlen(devName) + 1); + strcpy(deviceDir, devName); + ptr = deviceDir + (strlen(devName) - 1); + while (*ptr != '/') + *ptr-- = '\0'; + if (access(deviceDir, X_OK) && mkdir(deviceDir, 0644)) { + printf("mkdir: cannot create directory %s: %d\n", deviceDir, errno); + } + } + if (smartmknod(devName, S_IFBLK | 0600, + makedev(major, minor))) { + printf("failed to create %s\n", devName); + } + } + + *chptr = old; + start = chptr; + } + + } + } + + start = strchr(start, '\n'); + if (!*start) return 1; + start = start + 1; + } + + return 0; +} + +static int getDevNumFromProc(char * file, char * device) { + char buf[32768], line[4096]; + char * start, *end; + int num; + int fd; + + if ((fd = open(file, O_RDONLY)) == -1) { + printf("can't open file %s: %d\n", file, errno); + return -1; + } + + num = read(fd, buf, sizeof(buf)); + if (num < 1) { + close(fd); + printf("failed to read %s: %d\n", file, errno); + return -1; + } + buf[num] = '\0'; + close(fd); + + start = buf; + end = strchr(start, '\n'); + while (start && end) { + *end++ = '\0'; + if ((sscanf(start, "%d %s", &num, line)) == 2) { + if (!strncmp(device, line, strlen(device))) + return num; + } + start = end; + end = strchr(start, '\n'); + } + return -1; +} + +int mkDMNodCommand(char * cmd, char * end) { + int major = getDevNumFromProc("/proc/devices", "misc"); + int minor = getDevNumFromProc("/proc/misc", "device-mapper"); + + if ((major == -1) || (minor == -1)) { + printf("Unable to find device-mapper major/minor\n"); + return 1; + } + + if (!access("/dev/mapper/control", R_OK)) { + struct stat sb; + if (stat("/dev/mapper/control", &sb) == 0) { + if (S_ISCHR(sb.st_mode) && (sb.st_rdev == makedev(major, minor))) + return 0; + } + + unlink("/dev/mapper/control"); + } + + if (smartmknod("/dev/mapper/control", S_IFCHR | 0600, + makedev(major, minor))) { + printf("failed to create /dev/mapper/control\n"); + return 1; + } + + return 0; +} + +int setQuietCommand(char * cmd, char * end) { + int fd, rc; + + if ((fd = open("/proc/cmdline", O_RDONLY)) >= 0) { + char * buf = malloc(512); + rc = read(fd, buf, 511); + if (strstr(buf, "quiet") != NULL) + reallyquiet = 1; + close(fd); + free(buf); + } + + if (reallyquiet) + quiet = 1; + + return 0; +} + +int runStartup(int fd) { + char contents[32768]; + int i; + char * start, * end; + char * chptr; + int rc; + + i = read(fd, contents, sizeof(contents) - 1); + if (i == (sizeof(contents) - 1)) { + printf("Failed to read /startup.rc -- file too large.\n"); + return 1; + } + close(fd); + + contents[i] = '\0'; + + start = contents; + while (*start) { + while (isspace(*start) && *start && (*start != '\n')) start++; + + if (*start == '#') + while (*start && (*start != '\n')) start++; + + if (*start == '\n') { + start++; + continue; + } + + if (!*start) { + printf("(last line in /startup.rc is empty)\n"); + continue; + } + + /* start points to the beginning of the command */ + end = start + 1; + while (*end && (*end != '\n')) end++; + if (!*end) { + printf("(last line in /startup.rc missing \\n -- skipping)\n"); + start = end; + continue; + } + + /* end points to the \n at the end of the command */ + + chptr = start; + while (chptr < end && !isspace(*chptr)) chptr++; + + if (!strncmp(start, "mount", MAX(5, chptr - start))) + rc = mountCommand(chptr, end); + else if (!strncmp(start, "losetup", MAX(7, chptr - start))) + rc = losetupCommand(chptr, end); + else if (!strncmp(start, "echo", MAX(4, chptr - start))) + rc = echoCommand(chptr, end); + else if (!strncmp(start, "raidautorun", MAX(11, chptr - start))) + rc = raidautorunCommand(chptr, end); + else if (!strncmp(start, "pivot_root", MAX(10, chptr - start))) + rc = pivotrootCommand(chptr, end); + else if (!strncmp(start, "switchroot", MAX(10, chptr - start))) + rc = switchrootCommand(chptr, end); + else if (!strncmp(start, "mkrootdev", MAX(9, chptr - start))) + rc = mkrootdevCommand(chptr, end); + else if (!strncmp(start, "umount", MAX(6, chptr - start))) + rc = umountCommand(chptr, end); + else if (!strncmp(start, "exec", MAX(4, chptr - start))) + rc = execCommand(chptr, end); + else if (!strncmp(start, "mkdir", MAX(5, chptr - start))) + rc = mkdirCommand(chptr, end); + else if (!strncmp(start, "access", MAX(6, chptr - start))) + rc = accessCommand(chptr, end); + else if (!strncmp(start, "find", MAX(4, chptr - start))) + rc = findCommand(chptr, end); + else if (!strncmp(start, "findlodev", MAX(7, chptr - start))) + rc = findlodevCommand(chptr, end); + else if (!strncmp(start, "showlabels", MAX(10, chptr-start))) + rc = display_uuid_cache(); + else if (!strncmp(start, "mkdevices", MAX(9, chptr-start))) + rc = mkdevicesCommand(chptr, end); + else if (!strncmp(start, "sleep", MAX(5, chptr-start))) + rc = sleepCommand(chptr, end); + else if (!strncmp(start, "mknod", MAX(5, chptr-start))) + rc = mknodCommand(chptr, end); + else if (!strncmp(start, "mkdmnod", MAX(7, chptr-start))) + rc = mkDMNodCommand(chptr, end); + else if (!strncmp(start, "readlink", MAX(8, chptr-start))) + rc = readlinkCommand(chptr, end); + else if (!strncmp(start, "setquiet", MAX(8, chptr-start))) + rc = setQuietCommand(chptr, end); +#ifdef DEBUG + else if (!strncmp(start, "cat", MAX(3, chptr-start))) + rc = catCommand(chptr, end); + else if (!strncmp(start, "ls", MAX(2, chptr-start))) + rc = lsCommand(chptr, end); +#endif + else { + *chptr = '\0'; + rc = otherCommand(start, chptr + 1, end, 1); + } + + start = end + 1; + } + + return rc; +} + +int main(int argc, char **argv) { + int fd = 0; + char * name; + int rc; + int force = 0; + + name = strrchr(argv[0], '/'); + if (!name) + name = argv[0]; + else + name++; + + if (!strcmp(name, "modprobe")) + exit(0); + if (!strcmp(name, "hotplug")) { + argv[0] = strdup("/sbin/udev"); + execv(argv[0], argv); + printf("ERROR: exec of udev failed!\n"); + exit(1); + } + + testing = (getppid() != 0) && (getppid() != 1); + argv++, argc--; + + while (argc && **argv == '-') { + if (!strcmp(*argv, "--force")) { + force = 1; + argv++, argc--; + testing = 0; + } else if (!strcmp(*argv, "--quiet")) { + quiet = 1; + argv++, argc--; + } else if (!strcmp(*argv, "--reallyquiet")) { + reallyquiet = 1; + argv++, argc--; + } else { + printf("unknown argument %s\n", *argv); + return 1; + } + } + + if (force && !quiet) + printf("(forcing normal run)\n"); + + if (testing && !quiet) + printf("(running in test mode).\n"); + + if (!quiet) printf("Red Hat nash version %s starting\n", VERSION); + + if (*argv) { + fd = open(*argv, O_RDONLY, 0); + if (fd < 0) { + printf("nash: cannot open %s: %d\n", *argv, errno); + exit(1); + } + } + + /* runStartup closes fd */ + rc = runStartup(fd); + + return rc; +} -- 2.39.2