From a9b2bdafaf625d10aef2f476aa4014fd36c846bc Mon Sep 17 00:00:00 2001 From: Dexter Morgan Date: Thu, 2 Jun 2011 20:51:35 +0000 Subject: Branch for updates --- rescue/.perl_checker | 39 ++++ rescue/Makefile | 26 +++ rescue/NEWS | 115 ++++++++++ rescue/aliases | 2 + rescue/devices.pl | 55 +++++ rescue/dirs | 6 + rescue/diskdrake-resize | 28 +++ rescue/drvinst | 47 ++++ rescue/guessmounts | 100 +++++++++ rescue/install_bootloader | 69 ++++++ rescue/list.xml | 351 ++++++++++++++++++++++++++++++ rescue/lsparts | 45 ++++ rescue/make_flash_rescue | Bin 0 -> 2504 bytes rescue/make_partimage_save_rest_all | 64 ++++++ rescue/make_rescue_img | 61 ++++++ rescue/partimage_whole_disk | 264 +++++++++++++++++++++++ rescue/rescue-doc | 56 +++++ rescue/restore-image-lib.sh | 80 +++++++ rescue/restore-image.sh | 413 ++++++++++++++++++++++++++++++++++++ rescue/restore_ms_boot | 74 +++++++ rescue/tree/bin/insmod | 2 + rescue/tree/bin/login | 2 + rescue/tree/etc/fstab | 4 + rescue/tree/etc/group | 1 + rescue/tree/etc/host.conf | 2 + rescue/tree/etc/hosts | 1 + rescue/tree/etc/inittab | 14 ++ rescue/tree/etc/issue | 28 +++ rescue/tree/etc/passwd | 3 + rescue/tree/etc/profile | 24 +++ rescue/tree/etc/rc.reboot | 8 + rescue/tree/etc/rc.sysinit | 83 ++++++++ rescue/tree/etc/resolv.conf | 2 + rescue/tree/sbin/fakeshutdown | 39 ++++ rescue/tree/sbin/modprobe | 16 ++ rescue/tree/usr/lib/CVS. | 0 rescue/tree/usr/share/symlinks | 10 + 37 files changed, 2134 insertions(+) create mode 100644 rescue/.perl_checker create mode 100644 rescue/Makefile create mode 100644 rescue/NEWS create mode 100644 rescue/aliases create mode 100644 rescue/devices.pl create mode 100644 rescue/dirs create mode 100755 rescue/diskdrake-resize create mode 100755 rescue/drvinst create mode 100755 rescue/guessmounts create mode 100755 rescue/install_bootloader create mode 100644 rescue/list.xml create mode 100755 rescue/lsparts create mode 100755 rescue/make_flash_rescue create mode 100755 rescue/make_partimage_save_rest_all create mode 100755 rescue/make_rescue_img create mode 100755 rescue/partimage_whole_disk create mode 100755 rescue/rescue-doc create mode 100755 rescue/restore-image-lib.sh create mode 100755 rescue/restore-image.sh create mode 100755 rescue/restore_ms_boot create mode 100755 rescue/tree/bin/insmod create mode 100755 rescue/tree/bin/login create mode 100644 rescue/tree/etc/fstab create mode 100644 rescue/tree/etc/group create mode 100644 rescue/tree/etc/host.conf create mode 100644 rescue/tree/etc/hosts create mode 100644 rescue/tree/etc/inittab create mode 100644 rescue/tree/etc/issue create mode 100644 rescue/tree/etc/passwd create mode 100644 rescue/tree/etc/profile create mode 100755 rescue/tree/etc/rc.reboot create mode 100755 rescue/tree/etc/rc.sysinit create mode 100644 rescue/tree/etc/resolv.conf create mode 100755 rescue/tree/sbin/fakeshutdown create mode 100755 rescue/tree/sbin/modprobe create mode 100644 rescue/tree/usr/lib/CVS. create mode 100644 rescue/tree/usr/share/symlinks (limited to 'rescue') diff --git a/rescue/.perl_checker b/rescue/.perl_checker new file mode 100644 index 000000000..8ad989186 --- /dev/null +++ b/rescue/.perl_checker @@ -0,0 +1,39 @@ +bytes +constant +AutoLoader +Carp::Heavy +Compress::Zlib +Config::IniFiles +Convert::ASN1 +Cwd +Date::Manip +Digest::MD5 +Encode +encoding +feature +File::Basename +File::Find +File::FnMatch +File::GlobMapper +File::Path +File::Temp +Gtk2::Gdk::Keysyms +IO::Compress::Gzip +IO::Handle +IO::Socket::SSL +IO::Socket::UNIX +IO::Uncompress::Gunzip +Net::DBus::Binding::Introspector +Net::DBus::Binding::Iterator +Net::DBus::Test::MockIterator +Net::LDAP +Net::LDAP::Constant +Net::LDAP::Control +Net::LDAP::Filter +Net::LDAP::Schema +Net::LDAP::Util +Scalar::Util +String::ShellQuote +Term::ReadKey +Text::ParseWords +Time::ZoneInfo diff --git a/rescue/Makefile b/rescue/Makefile new file mode 100644 index 000000000..be463b8e0 --- /dev/null +++ b/rescue/Makefile @@ -0,0 +1,26 @@ +include ../Makefile.config + +VERSION=1.24 +PRODUCT=drakx-installer-rescue + +RESCUE = rescue.sqfs + +all: $(RESCUE) + +install: $(RESCUE) + cp -f $< $(STAGE2_DEST) + +$(RESCUE): list.xml drvinst guessmounts lsparts rescue-doc make_rescue_img + DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img + +tar: + rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION) + mkdir -p $(PRODUCT)-$(VERSION)/tools + svn export -q -rBASE . $(PRODUCT)-$(VERSION)/rescue + cp ../Makefile.config $(PRODUCT)-$(VERSION)/ + cp ../tools/install-xml-file-list $(PRODUCT)-$(VERSION)/tools + tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION) + rm -rf $(PRODUCT)-$(VERSION) + +clean: + rm -f $(RESCUE) kernel_read_part diff --git a/rescue/NEWS b/rescue/NEWS new file mode 100644 index 000000000..64ae52fca --- /dev/null +++ b/rescue/NEWS @@ -0,0 +1,115 @@ +Version 1.24 - 20 May 2011, by tmb + +- devices.pl: call mknod directly +- list.xml: add btrfs tools to the image +- list.xml: fix XSLoader path + +Version 1.23 - 06 April 2011, by Dmorgan + +- Fix function names ( Bug #651 ) + +Version 1.22 - 24 February 2011, by Pascal "pterjan" Terjan + +- cleaning for Mageia import +- include /etc/netconfig (needed by mount.nfs) + +Version 1.18 - 13 April 2010, by Olivier "blino" Blin + +- image restore script: use blkid instead of deprecated vol_id + +Version 1.17 - 12 April 2010, by Olivier "blino" Blin + +- Handle LVM (#44723) +- image restore script: handle hybrid images (by matching main device) + +Version 1.16 - 9 October 2009, by Olivier "blino" Blin + +- work both with squashfs 3 and 4 +- image restore script (from Paulo Ricardo Zanoni): + o re-read partition table after writing image + o do not extend / to the end of the disk, it overlaps with swap + partition +- do not make de-latin1 keymap a symlink/include loop (#45109) +- use extipl from /usr/lib/extipl on x86_64 too + (to fix restore_ms_boot, hardcoding this path) + +Version 1.15 - 3 September 2009, by Thierry Vignaud + +- add back dumpe2fs +- run /oem-rescue.sh if oem option is present on cmdline +- allow to specify main partition in the restore config file + (MAIN_PART_NUMBER), if there is a restore partition at beginning of + disk +- load ext4 module (#48816) +- use blkid instead of vol_id which we no longer ship + +Version 1.14 - 27 May 2009, by Olivier "blino" Blin + +- adapt to new extipl location in x86_64 +- adapt to new magic.mgc location + +Version 1.13 - 27 May 2009, by Olivier "blino" Blin + +- include various commands +- image restore script: + o better estimate of image dump progression + o fix detecting multiple partitions to avoid win32 detection + o fix guessing extension when filename contains a dot + +Version 1.12 - 20 February 2009, by Olivier "blino" Blin + +- image restore script: + o add swap partition + o use a minimum size for disks to be detected (Caio) + o resize Windows partitions if needed (Caio) +- Flash rescue: + o add support for Flash 2009 + o try to load squashfs-lzma too + o handle path to lzma distrib loopbacks +- fix build: + o do not include dead parsehdlist + o do not include dead rpm helpers + +Version 1.11 - 25 September 2008, by Olivier "blino" Blin + +- add image restoration scripts ("restore" command line parameter) + +Version 1.10 - 25 April 2008, by Olivier "blino" Blin + +- fix "Mounting other partitions from fstab" which use UUID=xxx +- fix build with latest file package, which only includes the + precompiled magic file + +Version 1.9 - 10 March 2008, by Olivier "blino" Blin + +- handle ntfs-3g in fstab +- add missing modalias files (#38690) + +Version 1.8 - 28 February 2008, by Olivier "blino" Blin + +- support new modules location (#38207) +- adapt to perl 5.10 +- fix build (fix a workaround in partimage_whole_disk) + +Version 1.7 - 25 September 2007, by Pascal "Pixel" Rigaux + +- add mount.nfs binary (since mount doesn't handle nfs fs anymore) + +Version 1.6 - 8 August 2007, by Pascal "Pixel" Rigaux + +- adapt to new libldetect together with drakx-installer-images 1.13 +- loadkeys file: + o handle new "kbd" rpm which have .map files instead of .kmap + o don't skip fr_CH-latin1 + o handle "fr_CH"-like short names +- remove rescuept (use testdisk instead, which is much nicer) + +Version 1.5 - 9 July 2007, by Pascal "Pixel" Rigaux + +- add /etc/mke2fs.conf in order to format ext3fs with 4k blocks (#27377) +- add "mkfs.ext3" which is no more equivalent to "mkfs.ext2 -J" + (eg: dir_index & resize_inode features) + +Version 1.4 - 4 April 2007, by Pascal "Pixel" Rigaux + +- zcat and gunzip can't be symlinks anymore, they are scripts diff --git a/rescue/aliases b/rescue/aliases new file mode 100644 index 000000000..59c96a124 --- /dev/null +++ b/rescue/aliases @@ -0,0 +1,2 @@ +/bin/vi vim-minimal +/lib/modules /modules diff --git a/rescue/devices.pl b/rescue/devices.pl new file mode 100644 index 000000000..0d0c6af9d --- /dev/null +++ b/rescue/devices.pl @@ -0,0 +1,55 @@ +#!/usr/bin/perl + +@ARGV == 1 && chdir $ARGV[0] or die "usage: devices.pl \n"; + +foreach () { + chomp; + my ($typ, $maj, $min, @l) = split; + foreach (@l) { + my @l2 = do { + if (my ($prefix, $ini, $end) = /(.*)(\d+)-(\d+)$/) { + map { "$prefix$_" } $ini .. $end; + } else { + $_; + } + }; + foreach (@l2) { + my $cmd = "mknod -m 600 $_ $typ $maj " . $min++; + system($cmd) == 0 or die "$cmd failed\n"; + } + } +} + +__DATA__ +c 5 1 console +b 2 0 fd0-1 +c 1 2 kmem +b 7 0 loop0-15 +c 1 1 mem +c 1 3 null +c 1 4 port +b 1 1 ram +b 1 0 ram0-19 +b 1 0 ramdisk +c 1 8 random +b 11 0 scd0-7 +c 0 0 stderr +c 0 0 stdin +c 0 0 stdout +c 5 0 tty +c 4 0 tty0-9 +c 4 64 ttyS0-3 +c 1 9 urandom +c 1 5 zero +b 3 0 hda hda1-16 +b 3 64 hdb hdb1-16 +b 22 0 hdc hdc1-16 +b 22 64 hdd hdd1-16 +b 33 0 hde hde1-16 +b 33 64 hdf hdf1-16 +b 34 0 hdg hdg1-16 +b 34 64 hdh hdh1-16 +b 8 0 sda sda1-15 sdb sdb1-15 sdc sdc1-15 sdd sdd1-15 sde sde1-15 sdf sdf1-15 sdg sdg1-15 sdh sdh1-15 +b 9 0 md0-15 +c 10 144 nvram +c 9 0 st0-15 diff --git a/rescue/dirs b/rescue/dirs new file mode 100644 index 000000000..e6d5a5d47 --- /dev/null +++ b/rescue/dirs @@ -0,0 +1,6 @@ +/lib +/tmp +/modules +/proc +/dev +/dev/pts diff --git a/rescue/diskdrake-resize b/rescue/diskdrake-resize new file mode 100755 index 000000000..96157b9f5 --- /dev/null +++ b/rescue/diskdrake-resize @@ -0,0 +1,28 @@ +#!/usr/bin/perl + +use lib qw(/usr/lib/libDrakX); + +use devices; +use log; +use resize_fat::main; +use diskdrake::resize_ntfs; +use diskdrake::resize_ext2; + +my ($device, $fs_type, $size) = @ARGV + or die "usage: $0 \n"; + +my %fs_pkgs = ( + vfat => 'resize_fat::main', + ntfs => 'diskdrake::resize_ntfs', + ext2 => 'diskdrake::resize_ext2', + ext3 => 'diskdrake::resize_ext2', +); + +my $resize_pkg = $fs_pkgs{$fs_type} + or die "no support for $fs_type type\n"; + +log::l("resizing $device to $size"); + +my $resize = $resize_pkg->new($device, devices::make($device)) + or die "unable to initialize resize\n"; +$resize->resize($size); diff --git a/rescue/drvinst b/rescue/drvinst new file mode 100755 index 000000000..cc7fb4fa2 --- /dev/null +++ b/rescue/drvinst @@ -0,0 +1,47 @@ +#!/usr/bin/perl +# +# Guillaume Cottenceau +# +# Copyright 2000-2005 Mandriva +# +# 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. +# + +use lib qw(/usr/lib/libDrakX); +use common; +use detect_devices; + +$ARGV[0] =~ /^--?h/ and die "usage: drivers_install [drivertype1 [drivertype2 ...]]\n"; +my @types = @ARGV; + +sub install_module_raw { + my ($driver, $o_descr) = @_; + print STDERR "Installing driver $driver", $o_descr ? " (for \"$o_descr\")" : '', "\n"; + system("/sbin/modprobe", $driver) and print "\tfailed\n"; +} + +my $already_usb; +sub install_module { + my ($driver, $descr) = @_; + install_module_raw($driver, $descr); + if (!$already_usb && $driver =~ /usb/) { + $already_usb = 1; + install_module_raw('usbkbd'); + install_module_raw('keybdev'); + } +} + +#- start +foreach my $card (detect_devices::pci_probe()) { + $card->{driver} eq 'unknown' || $card->{driver} =~ /:/ and next; + $card->{media_type} eq "DISPLAY_VGA" and next; + + if (!@ARGV || find { $card->{media_type} =~ /$_/i } @types) { + install_module($card->{driver}, $card->{description}); + } +} diff --git a/rescue/guessmounts b/rescue/guessmounts new file mode 100755 index 000000000..37e2249a1 --- /dev/null +++ b/rescue/guessmounts @@ -0,0 +1,100 @@ +#!/usr/bin/perl +# +# Guillaume Cottenceau +# +# Copyright 2001-2005 Mandriva +# +# 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. +# + +use lib qw(/usr/lib/libDrakX); +use common; +use fs; +use fs::proc_partitions; +use fs::type; +use lvm; +use run_program; + +my @proc_mounts = fs::read_fstab('', '/proc/mounts'); + +my $target = '/mnt'; + +if (fs::get::mntpoint2part($target, \@proc_mounts)) { + print STDERR "$target is already mounted (according to /proc/mounts)\n"; + exit 0; +} + +system('drvinst', 'STORAGE'); + +print STDERR "\nPlease wait, trying to find your root device...\n"; + +mkdir_p($target); + +lvm::detect_during_install(); + +my @parts = map { + $_->{device} = delete $_->{dev}; + put_in_hash($_, fs::type::type_subpart_from_magic($_)); +} fs::proc_partitions::read_raw(); +my ($raid_parts, $normal_parts) = partition { isRawRAID($_) } @parts; + +if (@$raid_parts) { + require raid; + raid::detect_during_install_once(@$raid_parts); + my $raids = raid::get_existing(@$raid_parts); + push @$normal_parts, @$raids; +} + +my @fstab; +my $root; + +foreach (@$normal_parts) { + my $dev = devices::make($_->{device}); + + my $fs = find { + system("mount -t $_ $dev $target 2>/dev/null") == 0; + } fs::type::true_local_fs_types() or next; + + if (my $release_file = common::release_file($target)) { + print STDERR "=> found a %s root partition on $dev\n=> type $fs, version `", + chomp_(cat_("$target$release_file")), "'\n"; + @fstab = fs::read_fstab($target, '/etc/fstab'); + $root = $dev; + last; + } else { + system('umount', $target) == 0 or die "error unmounting $target\n"; + } +} + +if ($root) { + print STDERR "\nMounting other partitions from fstab on $target...\n"; + foreach (@fstab) { + my ($valued_options, $options) = fs::mount_options::unpack($_); + + next if + !$_->{fs_type} || $_->{device} eq 'none' + || $valued_options->{noauto} + || $_->{mntpoint} eq '/' + || member($_->{fs_type}, 'swap', 'nfs', 'ntfs', 'ntfs-3g'); + + delete $valued_options->{'iocharset='}; + delete $valued_options->{'codepage='}; + fs::mount_options::pack($_, $valued_options, $options); #- vfat opts, we don't have the modules in rescue + + my $where = "$target$_->{mntpoint}"; + my $dev = fs::wild_device::from_part('', $_); + mkdir_p($where); + print STDERR "\t$dev on $where type $_->{fs_type} options $_->{options}\n"; + system("mount -t $_->{fs_type} $dev $where -o $_->{options}"); + system("cp -f /etc/mtab $target/etc/mtab"); #- to allow a nice chrooted "mount" or "df" + } + print STDERR "\nYour system is ready on $target.\n\n"; +} else { + die "Could not find your root device :-(.\n"; +} + diff --git a/rescue/install_bootloader b/rescue/install_bootloader new file mode 100755 index 000000000..5c7f9012f --- /dev/null +++ b/rescue/install_bootloader @@ -0,0 +1,69 @@ +#!/usr/bin/perl +# +# Guillaume Cottenceau +# +# Copyright 2001-2005 Mandriva +# +# 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. +# + +use lib qw(/usr/lib/libDrakX); +use common; +use bootloader; +use fs; + +if ($ARGV[0] eq '--auto') { + $auto = shift @ARGV; +} + +$::prefix = '/mnt'; + +my $release = common::mageia_release($::prefix) || + do { + system('guessmounts') == 0 or die 'guessmounts failed'; + common::mageia_release($::prefix); + }; + +if ($release) { + $release =~ /Mageia|Mandriva/ or die "release file doesn't contain '%s', exiting.\n"; +} elsif (fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ])) { + die "unknown distribution mounted in $::prefix\n"; +} else { + die "Your root device isn't mounted on $::prefix\n"; +} + +my @main_methods = bootloader::configured_main_methods(); + +my $main_method; +if (@main_methods == 0) { + die "Cannot find a configured boot loader\n"; +} elsif (@main_methods == 1) { + ($main_method) = @main_methods; +} else { + while (1) { + print "Configuration files for Boot Loaders ", join(' and ', @main_methods), " were found.\n"; + print "Which one one should be installed? "; + chomp($main_method = ); + if (member($main_method, @main_methods)) { + last; + } else { + print "bad choice\n"; + } + } +} + +my $install = $bootloader::{'install_raw_' . $main_method} or die "unknown bootloader method install_raw_$main_method\n"; + +print "About to re-install Boot Loader $main_method of following %s distribution:\n\t", + $release, "\n"; +if (!$auto) { + print "=> ok? "; + =~ /^n/i and exit 0; +} + +$install->(); diff --git a/rescue/list.xml b/rescue/list.xml new file mode 100644 index 000000000..7e057931f --- /dev/null +++ b/rescue/list.xml @@ -0,0 +1,351 @@ + + + + bash sh + + false true + pwd reset + + ls + cp ln mkdir mknod mv rm rmdir + chmod chown + dd touch + + cat less + tail head tee + sort split cut + grep + + cmp diff + find + file md5sum + + gzip zcat gunzip + bzip2 bunzip2 bzcat + + df du + + packdrake + cpio ftp tar + rsync + ssh scp + telnet + host + + date + dmesg + chroot + sleep + sync + + eject + mount mount.nfs umount + losetup + + ldconfig + mingetty init + reboot halt shutdown + kill killall5 ps strace + sed tr + strings + + loadkeys tset stty + + ping hostname ifconfig route + + fdformat badblocks + mkswap swapoff swapon + e2fsck fsck.ext2 fsck.ext3 fsck.ext4 + mke2fs mkfs.ext2 mkfs.ext3 mkfs.ext4 + dumpe2fs tune2fs resize2fs debugfs + + mkfs.reiserfs resize_reiserfs reiserfstune reiserfsck + mkfs.xfs xfs_admin xfs_repair fsck.xfs + mkfs.ntfs mkdosfs dosfslabel mkntfs ntfsresize ntfslabel + + btrfs btrfsck btrfs-convert btrfsctl btrfs-debug-tree + btrfs-map-logical btrfs-show btrfs-vol mkfs.btrfs fsck.btrfs + + mkfs.jfs fsck.jfs jfs_tune + + quotacheck + cryptsetup dmsetup + + + hformat + + + + fdisk gpart + testdisk photorec + + + + sfdisk + + + + pdisk + + dump dump.ext2 restore restore.ext2 dump.ext3 restore.ext3 dump.xfs restore.xfs + parted partimage + + mdadm lvm2 + mdmon kpartx + dmevent_tool + dmeventd + + dmraid + + + lsmod + insmod + rmmod + + setserial + mt stinit + + lspci lspcidrake + + rpm + rpm2cpio rpmdb + rpmquery rpmverify + + vim-minimal hexedit + + perl + uniq + wget + + awk clear dialog wc + setterm + + + dmidecode + + + + grub grub-install + + + efibootmgr + + + ybin + mkofboot ofpath + nvsetenv + + + silo + + + + + /usr/lib/kbd/keymaps/include + + /usr/lib/kbd/keymaps/i386/include + /usr/lib/kbd/keymaps/i386/azerty/be-latin1.map.gz + + /usr/share/misc/magic.mgc + /usr/share/terminfo/l/linux + /usr/share/pci.ids + /var/run/utmp + + + + stage1 + stage2 + *_stage1_5 + + /usr/lib/extipl/aldebaran.bin + + + + /usr/lib/yaboot/ofboot + /usr/lib/yaboot/yaboot + + + + perl -Mkeyboard -I/usr/lib/libDrakX -le 'print foreach keyboard::loadkeys_files()' + + + + /usr/lib/gconv/gconv-modules + /usr/lib/gconv/ISO8859-15.so + /usr/share/locale/ISO-8859-15 + /usr/share/locale/fr_FR + /usr/share/locale/fr/LC_MESSAGES/partimage.mo + + + /usr/lib/gconv/gconv-modules + /usr/lib/gconv/ISO8859-15.so + /usr/share/locale/ISO-8859-15 + /usr/share/locale/pt_BR + /usr/share/locale/pt/LC_MESSAGES/partimage.mo + + + /usr/lib/gconv/IBM850.so + + + /sbin/mount.ntfs-3g + /sbin/blkid + + + + + rpmrc + macros + rpmpopt-* + + + + + + AutoLoader.pm + strict.pm + vars.pm + warnings/register.pm + warnings.pm + Carp.pm + Exporter.pm + File/Path.pm + File/Basename.pm + ARCH-linux-thread-multi/re.pm + ARCH-linux-thread-multi/Cwd.pm + ARCH-linux-thread-multi/auto/Cwd/Cwd.so + ARCH-linux-thread-multi/CORE/libperl.so + ARCH-linux-thread-multi/auto/POSIX/autosplit.ix + ARCH-linux-thread-multi/auto/POSIX/load_imports.al + ARCH-linux-thread-multi/auto/POSIX/POSIX.so + ARCH-linux-thread-multi/POSIX.pm + XSLoader.pm + ARCH-linux-thread-multi/lib.pm + ARCH-linux-thread-multi/Socket.pm + ARCH-linux-thread-multi/IO/Socket.pm + ARCH-linux-thread-multi/IO.pm + ARCH-linux-thread-multi/IO/Handle.pm + ARCH-linux-thread-multi/Encode/Symbol.pm + Symbol.pm + SelectSaver.pm + ARCH-linux-thread-multi/auto/DynaLoader/dl_findfile.al + ARCH-linux-thread-multi/DynaLoader.pm + ARCH-linux-thread-multi/auto/IO/IO.so + ARCH-linux-thread-multi/auto/Socket/Socket.so + ARCH-linux-thread-multi/Errno.pm + ARCH-linux-thread-multi/IO/Socket/INET.pm + ARCH-linux-thread-multi/IO/Socket/UNIX.pm + + + packdrake.pm + MDV/Packdrakeng.pm + + + + + mke2fs.conf + netconfig + inputrc + termcap + protocols + services + ssh/ssh_config + + + + + libnss_files.so.2 + libnss_dns.so.2 + libresolv.so.2 + ld-linux*.so.2 + + + + + *table.gz + dkms-modules.alias fallback-modules.alias + + + + ldetect-lst-modules.alias + + + + + + rescue-doc drvinst lsparts + guessmounts install_bootloader + + restore_ms_boot + + + + partimage_whole_disk + + + + raid.pm + fs/dmraid.pm + partition_table/*.pm + + + + + + rescue-gui + + + dhcp-client + + + + + bootable_flag.sh + fdisk_to_desc + gen_modprobe_conf.pl + ka-d-client + ka-d-server + ka-d.sh + ka_replication.sh + make_initrd_grub + make_initrd_lilo + prepare_node.sh + send_status.pl + status_node.pl + store_log.sh + udev_creation.sh + + + + + replication.conf + + + + + diskdrake-resize + + + restore-image.sh + + + restore-image-lib.sh + + + + + dirname + losetup + mlabel + nash + pv + sed + usleep + + + + * + + + + + diff --git a/rescue/lsparts b/rescue/lsparts new file mode 100755 index 000000000..e1e866db4 --- /dev/null +++ b/rescue/lsparts @@ -0,0 +1,45 @@ +#!/usr/bin/perl +# +# Main author Pascal Rigaux (pixel@mandriva.com) +# Put together by Guillaume Cottenceau +# +# Copyright 1999-2005 Mandriva +# +# 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. +# +# +# Detects partition types using signatures +# + +use lib qw(/usr/lib/libDrakX); +use common; +use fs::type; +use fs::proc_partitions; + +my $params = join '', @ARGV; +my $verbose = $params =~ /-v/; + +$params =~ /-h/ and die "usage: lsparts [-v]\n"; + + +foreach (fs::proc_partitions::read_raw()) { + if (my $err = $_->{size} <= 1 ? + "Skipping <$_->{dev}> because too little blocks ($_->{size})" : + $_->{dev} !~ /\d$/ ? + "Skipping <$_->{dev}> because doesn't end with a number (e.g. seems to not be a partition)" : + $_->{dev} =~ /^loop\d+$/ ? + "Skipping <$_->{dev}>" : + '') { + print STDERR "$err\n" if $verbose; + } else { + $_->{device} = $_->{dev}; + if (my $type = fs::type::type_subpart_from_magic($_)) { + printf "$_->{dev}: %6s, fs %s (%s)\n", formatXiB($_->{size} * 512), $type->{fs_type}, fs::type::part2type_name($type); + } + } +} diff --git a/rescue/make_flash_rescue b/rescue/make_flash_rescue new file mode 100755 index 000000000..b439b9adc Binary files /dev/null and b/rescue/make_flash_rescue differ diff --git a/rescue/make_partimage_save_rest_all b/rescue/make_partimage_save_rest_all new file mode 100755 index 000000000..929ffd2c1 --- /dev/null +++ b/rescue/make_partimage_save_rest_all @@ -0,0 +1,64 @@ +#!/bin/sh + +[ $# -lt 1 ] && { + echo "usage: make_partimage_save_rest_all [ ]" ; + exit 1 +} + +server=$1 ; shift +partimage_dir=$1 ; shift +data_dir=$1 ; shift + +if [ -n "$partimage_dir" ]; then + first_data_dir="$partimage_dir$data_dir" + + [ -d "$first_data_dir" ] || { + echo "can't find $first_data_dir" + exit 1 + } + [ -r "$first_data_dir/lst" ] || { + echo "can't read $first_data_dir/*" + exit 1 + } +fi + +rm -rf .tmp +mkdir -p .tmp/isolinux +cp -f /usr/lib/syslinux/isolinux.bin ../images/isolinux/alt0/* .tmp/isolinux + +DISTRIB_DESCR="partimage save/restore all" ./make_rescue_img || exit 1 +mkdir -p .tmp/install/stage2 +mv -f rescue.sqfs .tmp/install/stage2 + +common_para="rescue automatic=method:cdrom" +# hda=4864,255,63 acpi=ht + +for action in save_all rest_all; do + + cat < .tmp/isolinux/isolinux.cfg +default $action +prompt 1 +timeout 150 + +label save_all + kernel vmlinuz + append initrd=all.rdz $common_para save_all pserver=$server +label rest_all + kernel vmlinuz + append initrd=all.rdz $common_para rest_all keepmounted BOX=$data_dir pserver=$server +label rescue + kernel vmlinuz + append initrd=all.rdz $common_para +EOF + + if [ $action = rest_all -a -n "$partimage_dir" ]; then + dir=`dirname $data_dir` + mkdir -p .tmp$dir + ln -s $partimage_dir$data_dir .tmp$dir + fi + + genisoimage -f -o part_$action.iso -r -J -hide-rr-moved -nobak -cache-inodes -publisher Mageia -V 'part save/rest' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table .tmp + mkcd --addmd5 part_$action.iso +done + +rm -rf .tmp diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img new file mode 100755 index 000000000..60769e922 --- /dev/null +++ b/rescue/make_rescue_img @@ -0,0 +1,61 @@ +#!/usr/bin/perl + +use MDK::Common; +use lib "/usr/lib/libDrakX"; +use keyboard; + +my $tmp = "/tmp/rescue_tmp"; +my $rescue = "rescue.sqfs"; + +if ($>) { + $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; +} + +BEGIN { undef *_ } +sub __ { print @_, "\n"; system(@_) } +sub _ { __ @_; $? and die } + +_ "rm -rf $tmp" if -e $tmp; +_ "mkdir $tmp"; +_ 'find . -name "*~" | xargs rm -f'; +mkdir_p($tmp . chomp_($_)) foreach cat_("dirs"); +_ "cp -a tree/* $tmp"; +_ "find $tmp -name .svn | xargs rm -rf"; +_ "perl devices.pl $tmp/dev"; +_ "mkfifo $tmp/dev/initctl"; +substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue"; + +_ "../tools/install-xml-file-list list.xml $tmp"; + +my %keytable_conflicts; +my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1); +foreach (keyboard::loadkeys_files()) { + my ($dir, $fname) = (dirname($_), basename($_)); + my ($name) = $fname =~ /(.*)\.map\.gz/ or next; + next if member($name, @less_important_keytables); + if (my ($short2, $short) = $name =~ m|((.+?)[\W_][^\W_]*)|) { + $keytable_conflicts{$short} && $short2 ne $name and $short = $short2; + $keytable_conflicts{$short} and warn("conflict between $keytable_conflicts{$short} and $name for short name $short (choosing the first)\n"), next; + $keytable_conflicts{$short} = $name; + # create the short name based on the long one + symlinkf($fname, "$tmp$dir/$short.map.gz"); + } +} + +foreach (cat_("aliases")) { + chomp; my ($f, $dest) = split; + symlink $dest, "$tmp$f"; +} + + +if (my ($LANGUAGE) = map { if_(/LANGUAGE_(.*)/, $1) } keys %ENV) { + substInFile { + $_ = "export LANGUAGE=$LANGUAGE\n" . "export LC_ALL=$LANGUAGE\n" if /^#LANGUAGE/; + } "$tmp/etc/rc.sysinit"; +} + +exit 0 if $ARGV[0]; + +_ "mksquashfs $tmp $rescue -all-root -noappend >/dev/null || mksquashfs3 $tmp $rescue -all-root -noappend >/dev/null"; +_ "chmod 755 $rescue"; +_ "rm -rf $tmp"; diff --git a/rescue/partimage_whole_disk b/rescue/partimage_whole_disk new file mode 100755 index 000000000..ed0653a95 --- /dev/null +++ b/rescue/partimage_whole_disk @@ -0,0 +1,264 @@ +#!/usr/bin/perl + +use lib qw(/usr/lib/libDrakX); +use standalone; +use fsedit; +use fs::format; +use fs::type; +use resize_fat::main; +use diskdrake::resize_ntfs; +use diskdrake::resize_ext2; +use common; +use partition_table::empty; +use Carp::Heavy; + +my %options = ( + save_home_directory => 1, + empty_space_at_end_of_disk => 0, # 300 * 1024 * 2, # 300MB + ask_before_modifying_home => 1, + bzip2 => 1, +); + +my ($server); +if ($ARGV[0] eq '-s') { + (undef, $server, @ARGV) = @ARGV; +} +my $action = shift @ARGV; + +sub usage() { die "partimage_whole_disk [-s ] (save_all | rest_all )\n" } + +$ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; +$ENV{HOME} = '/'; +log::openLog("/var/log/partimage_whole_disk.log"); +my @partimage_cmd = ('partimage', if_($server, '-s', $server, '-n', '-L')); + +@ARGV == 1 or usage(); + +if ($server && !is_network_configured()) { + run_program::run('drvinst', 'NETWORK'); + run_program::run('dhcp-client'); +} + +run_program::run('drvinst', 'STORAGE_SCSI', 'STORAGE_IDE'); + +my $all_hds = fsedit::get_hds({}); + +if ($action eq 'save_all') { + save_all($ARGV[0]); +} elsif ($action eq 'rest_all') { + rest_all($ARGV[0]); +} + +sub save_all { + my ($dir) = @_; + + my $base_dir = $dir; + for (my $i = 0; read_part_list($dir); $i++) { + #- find a free dir + $dir = sprintf("$base_dir.%03d", $i); + } + + my $hd = $all_hds->{hds}[0] or die "no main hard drive\n"; + log::l("save_all on $hd->{device}"); + my $part_list = [ partition_table::get_normal_parts($hd) ]; + + foreach (@$part_list) { + $_->{saved} = !member($_->{fs_type}, 'ntfs', 'ntfs-3g', 'vfat', 'swap'); + } + + if (!$options{save_home_directory}) { + #- shrink and don't save the last ext3 partition (which is the /home partition) + if (my $part = find { isTrueLocalFS($_) } reverse @$part_list) { + $part->{size} = min($part->{size}, 1024 * 1024 * 2); # not greater than 1GB + $part->{saved} = 0; + } + } + + foreach (grep { $_->{saved} } @$part_list) { + run_or_die(@partimage_cmd, + if_($options{bzip2}, '-z', 2), + '-V', 0, '--nombr', '--nodesc', '--nocheck', '-b', '-o', + 'save', devices::make($_->{device}), "$dir/$_->{device}"); + } + save_part_list($dir, $hd->{geom}, $part_list); +} +sub rest_all { + my ($dir) = @_; + + my ($forced_geom, $part_list) = read_part_list($dir) or error("read_part_list $dir failed"); + + (my $hd) = my @used_hds = uniq(map { + my $part = $_; + find { $part->{device} =~ /^\Q$_->{device}\E./ } fs::get::hds($all_hds) + or error("can't find hard drive for partition $part->{device}"); + } @$part_list); + + @used_hds >= 1 or error("no matching hd"); + @used_hds <= 1 or error("multiple hds: " . join(' ', map { $_->{device} } @used_hds)); + + fs::type::set_fs_type($_, $_->{fs_type}) foreach @$part_list; + put_in_hash($_, partition_table::hd2minimal_part($hd)) foreach @$part_list; + + my ($from_partimage, $other) = partition { $_->{saved} } @$part_list; + my ($from_resize, $created) = partition { member($_->{fs_type}, 'vfat', 'ntfs', 'ntfs-3g') } @$other; + + my $total = sum(map { $_->{size} } @$part_list); + if ($total > $hd->{totalsectors}) { + error("$dir doesn't fit: $total > $hd->{totalsectors}"); + } + + + foreach (@$from_resize) { + #- resize first + my $part = fs::get::device2part($_->{device}, [ fs::get::fstab($all_hds) ]); + if (!$part) { + log::l("partition to resize is missing ($_->{device})"); + $_->{missing} = 1; + next; + } + if ($part->{fs_type} ne $_->{fs_type}) { + log::l("partition $_->{device} doesn't have the right filesystem ($part->{fs_type} != $_->{fs_type})"); + $_->{missing} = 1; + next; + } + + if (@$from_resize == 1) { + my $half_size = int($hd->{totalsectors} / 2) - 2 * $hd->cylinder_size; + my $suggested_total = $total - $_->{size} + $half_size; + log::l("resizing bigger? (size $_->{size}, half_size $half_size, total $total, suggested_total $suggested_total)"); + if ($half_size > $_->{size} && $suggested_total < $hd->{totalsectors}) { + log::l("prefering to resize $_->{device} to size $half_size instead of $_->{size}"); + $_->{size} = $half_size; + } + } + + $_->{start} = $part->{start}; + if ($_->{size} < $part->{size}) { + log::l("resizing $_->{device} to $_->{size} (it is $part->{size})"); + my $resize_pkg = $_->{fs_type} eq 'vfat' ? 'resize_fat::main' : 'diskdrake::resize_ntfs'; + my $resize = $resize_pkg->new($_->{device}, devices::make($_->{device})); + $resize->resize($_->{size}); + } else { + log::l("no need to resize, instead setting $_->{device}'s size to $part->{size} instead of $_->{size}"); + $_->{size} = $part->{size}; + } + } + + put_in_hash($hd->{geom}, $forced_geom); + log::l("totalsectors $hd->{totalsectors} heads $hd->{geom}{heads} sectors $hd->{geom}{sectors}"); + partition_table::raw::compute_nb_cylinders($hd->{geom}, $hd->{totalsectors}); + + #- grow the last ext3 partition + if (my $part = find { isTrueLocalFS($_) } reverse @$part_list) { + $part->{ratio} = 1; + + if ($options{ask_before_modifying_home}) { + print "\nkeep existing /home? (Y/n) "; + if ( !~ /n/i) { + my $l = @$from_partimage > 1 ? $from_partimage : $created; + #- it was meant to be restored or formatted + my $p = pop @$l; + log::l("keeping existing /home: removing $p->{device}"); + } + } + } + + #- write the partition table + partition_table::raw::zero_MBR($hd); + foreach my $part (grep { $_->{rootDevice} eq $hd->{device} } @$part_list) { + next if $part->{missing}; + + my $hole = find { isEmpty($_) && $_->{size} >= $part->{size} } partition_table::get_normal_parts_and_holes($hd) or die "not enough room for $part->{device}"; + $part->{start} = $hole->{start}; + + log::l("handling $part->{device}"); + my $extended = $part->{device} =~ /(\d+)$/ && $1 > 4 && $hd->hasExtended; + + my %wanted_part = %$part; + if ($part->{ratio}) { + $part->{size} = $hole->{size} - ($options{empty_space_at_end_of_disk} || 0); + } else { + $part->{size} += $hd->{geom}{sectors} if $extended; + $part->{size} += $hd->cylinder_size if $part->{start} == 1; + } + log::l("adding $part->{device} with size $part->{size}"); + partition_table::add($hd, $part, $extended ? 'Extended' : 'Primary'); + foreach ('device', if_(!$part->{ratio}, 'size')) { + $part->{$_} eq $wanted_part{$_} or log::l("bad $_ for $part->{device}: $part->{$_} != $wanted_part{$_}"); + } + } + partition_table::write($hd); + + #- restore from partimage + foreach (@$from_partimage) { + run_or_die(@partimage_cmd, 'restore', '-b', devices::make($_->{device}), "$dir/$_->{device}"); + + if ($_->{ratio}) { + my $resize = diskdrake::resize_ext2->new($_->{device}, devices::make($_->{device})); + $resize->resize($_->{size}); + } + } + + foreach (@$created) { + fs::format::part_raw($_, undef); + } + + run_program::run('guessmounts'); + + if (my @missing = grep { $_->{missing} } @$part_list) { + my $missing = join('|', map { quotemeta($_->{device}) } @missing); + log::l("drop missing devices from fstab and lilo.conf: $missing"); + $::prefix = '/mnt'; + substInFile { $_ = '' if m!^/dev/($missing)\s! } "$::prefix/etc/fstab"; + + my $match; + substInFile { + /^\S/ and $match = m!^other=/dev/($missing)$!; + $_ = '' if $match; + } "$::prefix/etc/lilo.conf"; + } + + run_or_die('install_bootloader', '--auto'); + + print "\n", "Your system is ready, press enter to reboot (Y/n) "; + if ( !~ /n/i) { + run_program::run('reboot'); + } +} + +sub lst_fields() { qw(device size fs_type saved) } +sub save_part_list { + my ($dir, $geom, $part_list) = @_; + my @l = map { join(' ', @$_{lst_fields()}) } @$part_list; + log::l("save_part_list $dir: $_") foreach @l; + my $partimage = join(' ', @partimage_cmd); + open(my $F, "| $partimage -z0 -Bfoo=bar -o save_file $dir/lst"); + print $F join("/", $geom->{heads}, $geom->{sectors}), "\n"; + print $F "$_\n" foreach @l; +} +sub read_part_list { + my ($dir) = @_; + my $partimage = join(' ', @partimage_cmd); + open(my $F, "$partimage -z0 -Bfoo=bar rest_file $dir/lst |"); + my $geom_string = <$F> or return; + my %geom; @geom{'heads', 'sectors'} = split('/', chomp_($geom_string)); + my @l = chomp_(cat__($F)); + log::l("read_part_list $dir: $_") foreach @l; + \%geom, [ map { my %l; @l{lst_fields()} = split; \%l } @l ]; +} + +sub run_or_die { + my (@l) = @_; + run_program::raw({ timeout => 4 * 60 * 60 }, @l) or die join(' ', @l) . " failed\n"; +} + +sub error { + my ($msg) = @_; + log::l($msg); + die "$msg\n"; +} + +sub is_network_configured() { + my (undef, @l) = cat_('/proc/net/route'); + find { /^(\S+)/ && $1 ne 'lo' } @l; +} diff --git a/rescue/rescue-doc b/rescue/rescue-doc new file mode 100755 index 000000000..c324ac9e1 --- /dev/null +++ b/rescue/rescue-doc @@ -0,0 +1,56 @@ +#!/usr/bin/perl + +sub output { my $f = shift; local *F; open F, ">$f" or die "output in file $f failed: $!\n"; print F foreach @_; } + +output('/tmp/rescue-doc-contents', q( + Information regarding problems not directly addressed + by this rescue. + + +Are you certain "rescue mode" is the best tool for your specific +problem? + +The rescue system on this CD is a very basic text-based +environment for rescuing systems that no longer boot. You will +not find an easy-to-use graphical environment in this rescue +system, nor the detection/configuration libraries. + + +The vast majority of problems that can affect a Linux system are +much easier to repair on a running system than by booting into +"rescue mode". In fact, there are very few problems which aren't +easier to resolve in the comfortable environment of a fully +installed system than in this spartan "rescue system" shell. +Some of the most common problems include: + +- bad or missing X (video display) configuration +- adding/removing/reconfiguring hardware +- repairing problems caused by installing third-party software + with the "--force" and "--nodeps" options + +The general rule of thumb is: "If you can boot into the Linux +system without using rescue mode or this CD, there is no real +reason to use the rescue CD". + + +However, if you can no longer boot into the system, the rescue +system is the right tool. Some common examples include: + +- If you previously changed some parameters in the /etc/fstab and + the system will no longer boot, fix the offending line while in + rescue mode, then try to boot normally into your system. + +- If the problem cannot be completely resolved in rescue mode + (for example, if you need to reconfigure the video display), + just modify what's necessary to boot into a running system, + then complete the fix from there. + +For more information on troubleshooting your system, +please consult the official manuals, the documentation on +wiki.mageia.org or support forum at forum.mageia.org. + + +)); + +exec 'less /tmp/rescue-doc-contents'; + diff --git a/rescue/restore-image-lib.sh b/rescue/restore-image-lib.sh new file mode 100755 index 000000000..3451f7be5 --- /dev/null +++ b/rescue/restore-image-lib.sh @@ -0,0 +1,80 @@ +#!/bin/bash + +TITLE="%s Installer" +BACKTITLE="%s" +MIN_DISKSIZE=5000000 + +debug="/dev/null" + +function _msgbox() +{ + dialog --timeout 60 --backtitle "$BACKTITLE" --title "$TITLE" --msgbox \ + "$1" 0 0 + + return $? +} + +function _infobox() +{ + dialog --backtitle "$BACKTITLE" --title "$TITLE" --sleep 2 \ + --infobox "$1" 0 0 + + return $? +} + +function _yesno() +{ + dialog --backtitle "$BACKTITLE" --title "$TITLE" \ + --yes-label "Yes" --no-label "No" --yesno "$1" 0 0 + + return $? +} + +function _mount() +{ + mount $1 $2 > $debug 2>&1 + + return $? +} + +function _umount() +{ + umount $1 > $debug 2>&1 + + return $? +} + +function _bind() +{ + mount --bind $1 $2 > $debug 2>&1 + + return $? +} + +function _eject() +{ + eject $1 > $debug 2>&1 + + return $? +} + +function _shutdown() +{ + [ -e /tmp/no-shutdown ] && exit + clear + sync + echo s > /proc/sysrq-trigger + echo o > /proc/sysrq-trigger + exit +} + +function _reboot() +{ + [ -e /tmp/no-shutdown ] && exit + clear + sync + echo s > /proc/sysrq-trigger + echo b > /proc/sysrq-trigger + exit +} + diff --git a/rescue/restore-image.sh b/rescue/restore-image.sh new file mode 100755 index 000000000..32eec242d --- /dev/null +++ b/rescue/restore-image.sh @@ -0,0 +1,413 @@ +#!/bin/bash + +setterm -powersave off +setterm -blank 0 + +if [ -r ./restore-image-lib.sh ]; then + . ./restore-image-lib.sh +elif [ -r /usr/lib/restore-image-lib.sh ]; then + . /usr/lib/restore-image-lib.sh +fi + +export PATH="/sbin:/bin:/usr/sbin:/usr/bin" + +mnt_dir="/tmp/mnt" +restore_media="/tmp/media" +images_dir="$restore_media/images" +images="$images_dir/list" +images_config="$images_dir/config" +image="" +win32_part_dev= +win32_part_type= +win32_part_new_size= + +function read_config() +{ + if [ -r "$images_config" ]; then + . $images_config + fi +} + +function image_list() +{ + list=$(cat $images | awk -F',' \ + '{ print $1 " " $2 " " $4 }') + + echo $list +} + +function image_file() +{ + country="$1" + + file=$(grep ^$country $images | awk -F',' '{ print $3 }') + + echo $file +} + +function welcome() +{ + while true; do + clear + msg="\n Welcome to $TITLE\n\ +\nThe following images were found, select one:\n " + opcao=$(dialog --backtitle "$BACKTITLE" --title "$TITLE" \ + --stdout --radiolist "$msg" 0 0 0 \ + $(image_list)) + + if [ "$?" != "0" ]; then + _yesno "\nInterrupt installation?\n " + if [ "$?" = "0" ]; then + _shutdown + fi + else + if [ -z "$opcao" ]; then + continue + else + image=$(image_file $opcao) + break + fi + fi + done + + # disable kernel messages in the console + echo "1 4 1 7" > /proc/sys/kernel/printk +} + +function install_warning() +{ + if [ -n "${win32_part_dev}" ]; then + warn_msg="Windows installation detected.\nWe will set it up as dual boot. \ +You may lose some data.\nPlease backup before proceeding." + else + warn_msg="WARNING: This process will erase all data in this machine, \ +do you want to continue?" + fi + + clear + _yesno "\n$warn_msg\n" + if [ "$?" != "0" ]; then + _shutdown + fi +} + +function detect_root() +{ + inst_source_dev=$(awk "\$2 == \"$restore_media\" { print \$1 }" /proc/mounts | sed -e 's/[0-9]$//') + inst_source_dev=${inst_source_dev#/dev/} + devices=$(grep "^ .*[^0-9]$" < /proc/partitions | grep -v ${inst_source_dev} | awk '$3 > '$MIN_DISKSIZE' { print $4,$3 }') + + if [ -z "${devices}" ]; then + exit 1 + fi + + devs_found=$(($(echo $devices | wc -w)/2)) + + root_data=$(detect_win32 ${inst_source_dev}) + + if [ -z "${root_data}" ]; then + if [ "$devs_found" -gt "1" ]; then + if [ -n "${inst_source_dev}" ]; then + opcao=$(dialog --backtitle "$BACKTITLE" --title "$TITLE" --stdout --menu 'Choose one of the detected devices to restore to (check the blocks size column first):' 8 50 0 $devices ) + if [ "$?" != "0" ]; then + _yesno "\nInterrupt installation?\n " + if [ "$?" = "0" ]; then + _shutdown + fi + else + root_data=${opcao} + fi + fi + else + root_data=$(echo ${devices} | cut -d ' ' -f 1) + fi + fi + + echo ${root_data} +} + +function detect_win32() +{ + # from detect_root() + skip_dev=${1} + + # win32 detection won't handle complex layouts + if [ $(fdisk -l | grep "^/dev/" | grep -v ${skip_dev} | wc -l) -gt 1 ]; then + exit + fi + + # get the last created windows partition information + set -f + device=$(fdisk -l | grep "^/dev/" | grep -v ${skip_dev} | grep -e "FAT\|NTFS\|HPFS" | tail -1 | sed 's/ .*$//') + set +f + + if [ -z "${device}" ]; then + exit + fi + + # it might be needed, for safety + device_type=$(blkid -o value -s TYPE ${device}) + modprobe ${device_type} + + # df for that partition + mount ${device} /mnt + size=$(df ${device} | tail -1) + umount /mnt + + # its diskspace + used=$(echo ${size} | awk '{ print $3 }') + left=$(echo ${size} | awk '{ print $4 }') + avail=$((${left}/2)) + + if [ ! ${avail} -lt ${MIN_DISKSIZE} ]; then + win32_part_dev=${device} + win32_part_type=${device_type} + # our install takes half of 'left' + win32_part_new_size=$((${used}+${avail})) + + dev=${win32_part_dev#/dev/} + disk=${dev%[0-9]} + number=${dev#[a-w][a-w][a-w]} + let number++ + echo ${disk}${number} ${win32_part_dev} ${win32_part_type} ${win32_part_new_size} + fi +} + +function resize_win32() +{ + device=${1} + device_type=${2} + new_win32_size=${3} + + dialog --backtitle "$BACKTITLE" --title "$TITLE" --infobox "\nResizing Windows partition...\n" 4 55 + + dev=${device#/dev/} + disk=${dev%[0-9]} + win32_number=${dev#[a-w][a-w][a-w]} + + case ${device_type} in + vfat) device_id=b ;; + ntfs) device_id=7 ;; + hpfs) device_id=87 ;; + esac + + # wrapper around libdrakx by blino + diskdrake-resize ${device} ${device_type} $((${new_win32_size}*2)) &>/dev/null + + # we need some free sector here, rebuilding layout + fdisk /dev/${disk} &>/dev/null </dev/null </dev/null; dd bs=4M of=/dev/${root} >/tmp/backup.out 2>&1>>/tmp/log) & + + sleep 3 + pid=$(ps ax | grep 'dd bs=4M of' | grep -v grep | awk '{ print $1 }') + + while [ true ]; do + ps | grep -q $pid + if [ $? -eq 0 ]; then + /bin/kill -SIGUSR1 $pid + complete=$(tail -n 1 /tmp/backup.out | awk '{ print $1 }') + echo $((complete*100/total)) + sleep 1 + else + break + fi + done | dialog --backtitle "$BACKTITLE" --title "$TITLE" --gauge "\nWriting image..." 8 45 + + in=$(tail -n 3 /tmp/backup.out | grep 'in$' | cut -d' ' -f1) + out=$(tail -n 3 /tmp/backup.out | grep 'out$' | cut -d' ' -f1) + + if [ x"$in" != x"$out" ]; then + _msgbox "\nError writing image!\n" + sleep 24h + fi + + # Now re-read the partition table because 'dd' might have changed it + sfdisk -R /dev/${root} +} + +function grub_setup() +{ + root=${1} + grub_dir=${2} + + # install the bootloader + grub <> ${grub_dir}/menu.lst </dev/null| grep "Filesystem OS type" | awk '{ print $4 }') + if [ "${filesystem_type}" = "Linux" ]; then + dialog --backtitle "$BACKTITLE" --title "$TITLE" --infobox "Finishing Install... Expanding ${root}" 3 40 + disk=/dev/${root%[0-9]} + main_part=/dev/${root} + + # FIXME: absurdly dirty hack + main_part_num=${root:3} + swap_part_num=$((main_part_num+1)) + swap_part=${disk}${swap_part_num} + + main_part_sectors= + if [ -n "$SWAP_BLOCKS" ]; then + if [ -n "$EXPAND_FS" ]; then + total_blocks=$(sfdisk -s $disk) + main_part_blocks=$((total_blocks-SWAP_BLOCKS)) + main_part_sectors=$((main_part_blocks*2)) + else + main_part_sectors=$(sfdisk -d $disk | perl -lne 'm|^'$main_part'\b.*,\s*size\s*=\s*(\d+)\b| and print($1), exit') + fi + fi + if [ -n "$SWAP_BLOCKS" ]; then + parted $disk -- mkpartfs primary linux-swap ${main_part_sectors}s -1s yes + mkswap -L swap $swap_part + fi + if [ -n "$EXPAND_FS" ]; then + e2fsck -fy $main_part + fdisk $disk << EOF +d +$main_part_num +n +p +$main_part_num + + +a +$main_part_num +w +EOF + sfdisk -R $disk + e2fsck -fy $main_part + resize2fs $main_part + fi + mkdir -p $mnt_dir + mount $main_part $mnt_dir + grub_dir="$mnt_dir/boot/grub" + if [ -d "$grub_dir" ]; then + echo "(hd0) $disk" > "$grub_dir/device.map" + if [ -n "$win32_part_dev" ]; then + grub_setup ${root} ${grub_dir} + fi + fi + if [ -n "$MKINITRD" ]; then + mount -t sysfs none "$mnt_dir/sys" + mount -t proc none "$mnt_dir/proc" + echo > /proc/sys/kernel/modprobe # rescue's modprobe does not handle modprobe -q and aliases + chroot $mnt_dir bootloader-config --action rebuild-initrds + umount "$mnt_dir/sys" + umount "$mnt_dir/proc" + fi + umount $mnt_dir + fi +} + +# installation steps +welcome +read_config +detect_device +install_warning +write_image +expand_fs + +# all done! +_msgbox "\nInstallation process finished.\nPress ENTER to shutdown.\n " + +_shutdown + diff --git a/rescue/restore_ms_boot b/rescue/restore_ms_boot new file mode 100755 index 000000000..1f8cc2907 --- /dev/null +++ b/rescue/restore_ms_boot @@ -0,0 +1,74 @@ +#!/usr/bin/perl +# +# Guillaume Cottenceau, Pixel +# +# Copyright 2002-2005 Mandriva +# +# 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. +# + +use lib qw(/usr/lib/libDrakX); +use common; +use bootloader; +use fs; +use fs::proc_partitions; +use partition_table::raw; + + +my @choices = map { + my $type = partition_table::raw::typeOfMBR($_->{dev}); + if_($type && member($type, bootloader::main_method_choices()) , [ $_->{dev}, $type ]); +} fs::proc_partitions::read_raw(); + +my $choice; + +if (!@choices) { + print "No known Linux bootloader has been found, nothing to do.\n"; +} elsif (@choices == 1) { + print "I've found a Linux bootloader only on <$choices[0][0]>.\n\n"; + $choice = $choices[0]; +} else { + print "I've found the following Linux bootloaders:\n", + (map_index { "\t" . $::i . ": <$_->[1]> \ton <$_->[0]>\n" } @choices), + "\n", + "Which disk/partition do you want to overwrite with the Windows bootloader?\n", + "\t "; + if ( =~ /^(\d+)$/i && $1 >= 1) { + $choice = $choices[$1 - 1]; + } +} + +if ($choice) { + print "I'm going to overwrite bootloader on <$choice->[0]> with +Windows bootloader. + +Ok? "; + =~ /^n/i and exit 0; + + system('dd', 'if=/usr/lib/extipl/aldebaran.bin', "of=/dev/$choice->[0]") == 0 + or print "\tFailed!\n"; +} + +#------------------------------------------------- +#- $Log$ +#- Revision 1.5 2005/06/13 04:33:50 prigaux +#- move functions using /proc/partitions out of fsedit to fs::proc_partitions +#- +#- Revision 1.4 2005/05/19 08:59:54 prigaux +#- rewrite using DrakX modules +#- +#- Revision 1.3 2005/04/19 12:49:39 prigaux +#- update copyright +#- +#- Revision 1.2 2004/07/20 02:42:12 prigaux +#- MandrakeSoft -> Mandrakesoft +#- +#- Revision 1.1 2002/02/27 13:31:30 gc +#- add "restore Windows Boot Loader" to rescue +#- +#- diff --git a/rescue/tree/bin/insmod b/rescue/tree/bin/insmod new file mode 100755 index 000000000..49b298142 --- /dev/null +++ b/rescue/tree/bin/insmod @@ -0,0 +1,2 @@ +#!/bin/sh +echo "Use modprobe instead" diff --git a/rescue/tree/bin/login b/rescue/tree/bin/login new file mode 100755 index 000000000..4b2816926 --- /dev/null +++ b/rescue/tree/bin/login @@ -0,0 +1,2 @@ +#!/bin/sh +exec /bin/bash --login diff --git a/rescue/tree/etc/fstab b/rescue/tree/etc/fstab new file mode 100644 index 000000000..fbafb7801 --- /dev/null +++ b/rescue/tree/etc/fstab @@ -0,0 +1,4 @@ +/dev/ram3 / ext2 defaults 1 1 +/dev/fd0 /mnt/floppy auto defaults,noauto 0 0 +none /proc proc defaults,noauto,ro 0 0 +/dev/cdrom /mnt/cdrom auto defaults,noauto 0 0 diff --git a/rescue/tree/etc/group b/rescue/tree/etc/group new file mode 100644 index 000000000..5ba713c83 --- /dev/null +++ b/rescue/tree/etc/group @@ -0,0 +1 @@ +root::0:root diff --git a/rescue/tree/etc/host.conf b/rescue/tree/etc/host.conf new file mode 100644 index 000000000..1a8c1e151 --- /dev/null +++ b/rescue/tree/etc/host.conf @@ -0,0 +1,2 @@ +order hosts,bind +multi on diff --git a/rescue/tree/etc/hosts b/rescue/tree/etc/hosts new file mode 100644 index 000000000..d02c36416 --- /dev/null +++ b/rescue/tree/etc/hosts @@ -0,0 +1 @@ +127.0.0.1 mageia-rescue diff --git a/rescue/tree/etc/inittab b/rescue/tree/etc/inittab new file mode 100644 index 000000000..771d7c0d4 --- /dev/null +++ b/rescue/tree/etc/inittab @@ -0,0 +1,14 @@ +#Inittab for Mandrake Rescue Disk +#Author: Daouda Lo +id:3:initdefault: + +si::sysinit:/etc/rc.sysinit +re:6:wait:/etc/rc.reboot +ca:12345:ctrlaltdel:/sbin/fakeshutdown + +1:12345:respawn:/sbin/mingetty --autologin root tty1 +2:23:respawn:/sbin/mingetty tty2 +3:23:respawn:/sbin/mingetty tty3 +4:23:respawn:/sbin/mingetty tty4 +5:23:respawn:/sbin/mingetty tty5 +6:23:respawn:/sbin/mingetty tty6 diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue new file mode 100644 index 000000000..d4aee6d89 --- /dev/null +++ b/rescue/tree/etc/issue @@ -0,0 +1,28 @@ + + +    +            +               +               +             +  `----'          +        +      +     [2[1;37;4 +      +     +    Mageia Linux Rescue Disk +      +      +     +       + + +DISTRIB_DESCR + +Use loadkeys to change your keyboard layout (eg: loadkeys fr) +Use modprobe to load modules (eg: modprobe snd-card-fm801) +Use drvinst to install drivers according to detected devices +Use lsparts to list your partitions with types +Use rescue-gui to go back to the rescue menu + diff --git a/rescue/tree/etc/passwd b/rescue/tree/etc/passwd new file mode 100644 index 000000000..568451e4e --- /dev/null +++ b/rescue/tree/etc/passwd @@ -0,0 +1,3 @@ +root::0:0::/:/bin/bash +shutdown:*:6:0:shutdown:/sbin:/sbin/shutdown +halt:*:7:0:halt:/sbin:/sbin/halt diff --git a/rescue/tree/etc/profile b/rescue/tree/etc/profile new file mode 100644 index 000000000..3b5ac21cc --- /dev/null +++ b/rescue/tree/etc/profile @@ -0,0 +1,24 @@ +# /etc/profile +# (c) Mandrakesoft, Chmouel Boudjnah + +# System wide environment and startup programs +# Functions and aliases go in /etc/bashrc + +PROFILE_LOADED=1 + +export PATH=/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin + +PS1="[root@rescue \w]\\$ " +ls () { /bin/ls --color=auto -F "$@";} +ll () { /bin/ls --color=auto -Fl "$@";} +d () { /bin/ls --color=auto -F "$@";} +s () { cd .. ;} +which () { type -p "$@" ;} +HOSTNAME=rescue +HISTSIZE=1000 +HISTFILESIZE=1000 + +INPUTRC=/etc/inputrc +export PATH PS1 USER HOSTNAME HISTSIZE HISTFILESIZE INPUTRC + +cat /etc/issue diff --git a/rescue/tree/etc/rc.reboot b/rescue/tree/etc/rc.reboot new file mode 100755 index 000000000..0b67416f1 --- /dev/null +++ b/rescue/tree/etc/rc.reboot @@ -0,0 +1,8 @@ +#!/bin/sh + +sleep 1 +/sbin/killall5 -9 + +umount -a -f -t noproc + +reboot -i -d diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit new file mode 100755 index 000000000..e5164dd45 --- /dev/null +++ b/rescue/tree/etc/rc.sysinit @@ -0,0 +1,83 @@ +#!/bin/sh + +action() { echo $1; shift; $*; } +DATE=`date +%Y%m%d-%Hh%M` +KADIR="/ka2" + +export PATH=/bin:/sbin:/usr/bin:/usr/sbin + +echo -e "\t\t\tWelcome to \\033[1;36mMageia\\033[0;39m Linux" + +action "Remounting root filesystem in read-write mode" mount -n -o remount,rw / + +ln -s /tmp/stage2/etc/* /etc 2>/dev/null + +rm -f /dev ; cp -a /tmp/stage2/dev /dev + +mkdir -p /mnt /var/log + +>/etc/mtab +mount -f / +mount -f /proc + +# Set the hostname. +action "Setting hostname rescue" hostname rescue +echo rescue > /etc/HOSTNAME + +# Loads common modules ( no kerneld :( ) +echo "Loading additional modules..." +load() { modprobe $* 2>/dev/null; } +load ide-gd_mod +load ide-cd_mod +load floppy +load af_packet +load isofs +load vfat +load ext3 +load ext4 +load reiserfs +load xfs +load jfs +load loop +load sd_mod +load sr_mod + +/sbin/ifconfig lo 127.0.0.1 netmask 255.0.0.0 +/sbin/route add 127.0.0.1 lo + +# disable the weird echoprt in cooked mode for user interaction: +stty sane + +#LANGUAGE (filled by make_rescue_img) + +grep -q noauto /proc/cmdline || drvinst SERIAL_USB + +partimage_default_dir=/data/box +partimage_dir=`perl -lne 'print $1 if /BOX=(\S+)/' /proc/cmdline` +[ -z "$partimage_dir" ] && partimage_dir=$partimage_default_dir +partimage_server=`perl -lne 'print $1 if /\bpserver=(\S+)/' /proc/cmdline` + +if grep -q save_all /proc/cmdline; then + partimage_whole_disk -s $partimage_server save_all $partimage_default_dir +elif grep -q rest_all /proc/cmdline; then + if [ -d /tmp/image$partimage_dir ]; then + partimage_whole_disk rest_all /tmp/image$partimage_dir + else + partimage_whole_disk -s $partimage_server rest_all $partimage_dir + fi +elif grep -q oem /proc/cmdline; then + /tmp/image/oem-rescue.sh +elif grep -q restore /proc/cmdline; then + /usr/sbin/restore-image.sh +elif grep -q kamethod /proc/cmdline; then + echo "Welcome to Ka" + drvinst + ln -sf /tmp/stage2/ka $KADIR + ln -sf /tmp/stage2/disk /disk + cd $KADIR + echo "-------- Starting LOG server -------------" + perl send_status.pl > /tmp/kacmd & + exec ./ka_replication.sh > /tmp/ka_log-$HOSTNAME-$DATE 2>&1 +elif ! grep -q expert /proc/cmdline; then + rescue-gui +fi diff --git a/rescue/tree/etc/resolv.conf b/rescue/tree/etc/resolv.conf new file mode 100644 index 000000000..3822939b1 --- /dev/null +++ b/rescue/tree/etc/resolv.conf @@ -0,0 +1,2 @@ +search foo.com +nameserver 192.168.1.1 diff --git a/rescue/tree/sbin/fakeshutdown b/rescue/tree/sbin/fakeshutdown new file mode 100755 index 000000000..3511020ff --- /dev/null +++ b/rescue/tree/sbin/fakeshutdown @@ -0,0 +1,39 @@ +#!/usr/bin/perl + +# +# Guillaume Cottenceau (gc@mandrakesoft.com) +# +# Copyright 2001 Mandrakesoft +# +# 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. +# + +sub cat_ { local *F; open F, $_[0] or $_[1] ? die "cat of file $_[0] failed: $!\n" : return; my @l = ; wantarray ? @l : join '', @l } + +print "\n"; + + +#- try to umount as much as possible; uses Pixel's ultra optimized algo (let you guess how it works..) +print "Umounting:\n"; +my @mounts = cat_('/proc/mounts'); +my $something_moved; +do { + $something_moved = 0; + foreach (@mounts) { + my $where = (split)[1]; + next if $where eq '/'; #- ouch! umounting the ramdisk on / always succeeds, and makes it becoming ro :-( + if (!system("umount $where 2>/dev/null")) { + print "\t$where\n"; + $something_moved++; + } + } +} while $something_moved; + + +#- shutdown with init +exec '/sbin/init', 6; diff --git a/rescue/tree/sbin/modprobe b/rescue/tree/sbin/modprobe new file mode 100755 index 000000000..a9cd91a89 --- /dev/null +++ b/rescue/tree/sbin/modprobe @@ -0,0 +1,16 @@ +#!/usr/bin/perl + +use lib qw(/usr/lib/libDrakX); +use list_modules; +use modules; + +# based on install::commands +sub modprobe { + !@_ || $_[0] =~ /^-?-h/ and die "usage: modprobe []\n"; + my $name = shift; + list_modules::load_default_moddeps(); + modules::load_with_options([ $name ], { $name => join(' ', @_) }); +} + +$::isInstall = 1; +modprobe(@ARGV); diff --git a/rescue/tree/usr/lib/CVS. b/rescue/tree/usr/lib/CVS. new file mode 100644 index 000000000..e69de29bb diff --git a/rescue/tree/usr/share/symlinks b/rescue/tree/usr/share/symlinks new file mode 100644 index 000000000..5862fb8ac --- /dev/null +++ b/rescue/tree/usr/share/symlinks @@ -0,0 +1,10 @@ +/bin +/boot +/dev +/etc/fstab +/etc/inittab +/etc/rc.sysinit +/lib +/lib64 +/sbin +/usr -- cgit v1.2.1