diff options
Diffstat (limited to 'rescue')
50 files changed, 1633 insertions, 1760 deletions
diff --git a/rescue/.cvsignore b/rescue/.cvsignore deleted file mode 100644 index c660273e8..000000000 --- a/rescue/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -rescue.clp diff --git a/rescue/.gitignore b/rescue/.gitignore new file mode 100644 index 000000000..7b75a3e33 --- /dev/null +++ b/rescue/.gitignore @@ -0,0 +1 @@ +rescue.sqfs diff --git a/rescue/Makefile b/rescue/Makefile index 9721a68dc..b9462add0 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -1,12 +1,25 @@ include ../Makefile.config -all: rescue.clp +VERSION=1.68 +PRODUCT=drakx-installer-rescue -install: rescue.clp +RESCUE = rescue.sqfs + +all: $(RESCUE) + +install: $(RESCUE) cp -f $< $(STAGE2_DEST) -rescue.clp: list.xml drvinst guessmounts lsparts rescue-doc make_rescue_img +$(RESCUE): $(wildcard tree/**/*) $(wildcard bin/*) $(wildcard sbin/*) make_rescue_img list.xml aliases + if [[ -n "$$DEBUG_INSTALL_LANG" ]]; then perl -pi -e '$$_ = "loadkeys '$$DEBUG_INSTALL_LANG'\n$$_" if /LANGUAGE/' tree/usr/bin/mageia-rescue; fi DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img +dist: tar + +tar: + rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION) + @cd ..; git archive --prefix=$(PRODUCT)-$(VERSION)/ $(PRODUCT)-$(VERSION) rescue tools/install-xml-file-list Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz; + $(info $(PRODUCT)-$(VERSION).tar.xz is ready) + clean: - rm -f rescue.clp kernel_read_part + rm -f $(RESCUE) kernel_read_part diff --git a/rescue/NEWS b/rescue/NEWS new file mode 100644 index 000000000..dafe7c222 --- /dev/null +++ b/rescue/NEWS @@ -0,0 +1,362 @@ +Version 1.68 - 18 October 2025 by Jani Välimaa +- replace i586 with i686 in files +- fix and sort nedeed systemd files + - add systemd-executor + - remove systemd-cgroups-agent + +Version 1.67 - 28 April 2023 by Martin Whitaker + +- mount efivars in chroot on UEFI systems (mga#31844) + +Version 1.66 - 11 November 2020 by Thierry Vignaud + +- include overload.pm for File::Temp + +Version 1.65 - 16 June 2020 by Thierry Vignaud + +- fix running loadkeys w/o arg if DEBUG_INSTALL_LANG is not set (mga#26782) + +Version 1.64 - 20 March 2020 by Thierry Vignaud + +- debug mode: + o preset keyboard if DEBUG_INSTALL_LANG is set during build +- do not preload all fs modules uselessly +- guessmount: + o enable to repair encrypted LVMs/LUKS (mga#22795) + o fix displaying the version of the distro + o just use the fs reported by blkid instead of doing brute force guessing + +Version 1.63 - 19 March 2020 by Thierry Vignaud + +- add more tools for XFS & btrfs +- include all of /usr/lib/udev/hwdb.d (mga#20327) +- include F2FS tools +- include missing LVM tools symlinks (mga#25466) +- include ntfs3g compression support plugin +- include Encode::Unicode module for reFind + +Version 1.62 - 18 June 2019 by Thomas Backlund + +- start udevd to support lvm2 (mga#24878) + +Version 1.61 - 11 May 2019 by Thomas Backlund + +- update filelist for new systemd + +Version 1.60 - 22 November 2018 by Thierry Vignaud + +- fix collecting needed perl files with glibc-2.26 + +Version 1.59 - 26 August 2018 by Thomas Backlund + +- adapt for btrfs-progs 4.17.1 + +Version 1.58 - 26 August 2018 by Thomas Backlund + +- adapt for perl-5.28 + +Version 1.57 - 10 February 2018 by Thierry Vignaud + +- add more udev rules (syncing with regular stage2) + +Version 1.56 - 19 January 2018 by Thomas Backlund + +- adapt for new systemd + +Version 1.55 - 30 January 2017 by Thierry Vignaud + +- lsparts: fix reporting half sizes (mga#8853) + +Version 1.54 - 20 June 2016 by Thierry Vignaud + +- do not run shells uselessly +- drop (broken) support for Alpha, IA64 & PPC, Sparc +- fix a message when re-installing bootloader + +Version 1.53 - 28 September 2015 by Thierry Vignaud + +- fix build with libified perl + +Version 1.52 - 30 April 2015 by Thierry Vignaud + +- guessmount: mount /dev, /run & /sys too (mga#10865) +- lsparts (mga#8854): + o display label too + o silent run_program + +Version 1.51 - 15 April 2015 by Thierry Vignaud + +- fix reinstalling grub2 on UEFI (mga#15695) + +Version 1.50 - 9 January 2015 by Thomas Backlund + +- add efibootmgr on x86_64 + +Version 1.49 - 18 September 2014 by Thomas Backlund + +- 80-net-name-slot.rules is replaced with 99-default.link + +Version 1.48 - 18 September 2014 by Thomas Backlund + +- killall5 is no more needed + +Version 1.47 - 8 December 2013 by Colin Guthrie + +- use systemd as init in the rescue system +- allowing systemd-nspawn "booting" of a mounted /mnt (after umount /mnt/proc) + +Version 1.46 - 20 October 2013 by Colin Guthrie + +- adapt to a dracut based stage1 + +Version 1.45.1 - 14 October 2013 by Colin Guthrie + +- many btrfs tools no longer exist + +Version 1.45 - 14 October 2013 by Colin Guthrie + +- adapt to latest mdadm +- drop /etc/termcap as it's no longer part of our build +- include network interface name udev rules (mga#10947) + +Version 1.44 - 18 May 2013 by Colin Guthrie + +- ensure /dev is bind mounted before re-installing bootloader (mga#10107) + +Version 1.43 - 15 May 2013 by Colin Guthrie + +- ensure grabjournallogs script is executable (mga#10108) + +Version 1.42 - 30 April 2013 by Thierry Vignaud + +- add a script to simplfy grabbing of journal logs for bug reports +- enable to abort choosing distro to rescue (mga#9765) + +Version 1.41 - 6 April 2013 by Thierry Vignaud + +- really adapt to /usr move (fix lvm2 freezing, mga#5795) +- drop our "use modprobe instead" insmod since we've kmod one for free +- include libdevmapper-event-*.so +- include persistant storage udev rules needed to see new uuids +- offer to pick the distro to rescue when there's more than one +- /var/run/utmp is on tmpfs now +- warn that i586 cannot rescue x86_64 (mga#8696) + +Version 1.40 - 6 March 2013 by Thierry Vignaud + +- preload fuse (mga#5833) +- use kmod's modprobe, thus fixing loading modules (mga#9270) + +Version 1.39 - 3 September 2012 by Thierry Vignaud + +- adapt to latest systemd/udevd +- adapt to perl-5.16.0 +- adapt to /usr move +- default to the higher version when there're several mga roots (mga#6003) +- drop KA support +- fix detecting USB devices with kernel-3.5+ (mga#7248) +- preload load btrfs and nilfs2 too +- rely on stage1 for mounting /dev +- revert to "linux" terminfo +- simplify bringing up local loop interface (pok, mdv) +- stop fixing the raid udev rule now that it has been fixed + +Version 1.38 - 11 May 2012, by Thierry Vignaud + +- include missing modules when SMB appears in fstab (mga#5850) + +Version 1.37 - 18 April 2012, by Thierry Vignaud + +- fix detecting RAID (mga#5048) +- include more udev rules for RAID (mga#5048) + +Version 1.36 - 8 April 2012, by Pascal Terjan + +- fix modprobe to support being called by kernel (mga#5274) + +Version 1.35 - 5 April 2012, by Thierry Vignaud + +- add chrooted rescue system in PATH +- 32bit grub needs 32 bit loader (mga#5191) +- default to "screen" instead of "linux" terminfo (mga#4894) +- include "screen" terminfo (mga#4894) + +Version 1.34 - 26 February 2012, by Maarten Vanraes (AL13N) + +- escape / in generated passwords in startssh +- add trailing ; in command lists in startssh + +Version 1.33 - 26 February 2012, by Thierry Vignaud + +- do not symlink /dev (mga#1023) + +Version 1.32 - 25 February 2012, by Thierry Vignaud & Maarten Vanraes (AL13N) + +- don't overwrite /dev after udev handles it +- add some tests and error handling in startssh +- really fix mounting /dev/pts & /dev/shm (mga#1023) + +Version 1.31 - 25 February 2012, by Thierry Vignaud & Maarten Vanraes (AL13N) + +- add logging to dropbear +- fix mounting /dev/pts & /dev/shm (mga#1023) +- make root user homedir /root +- add agetty (mga#2052) + +Version 1.30 - 26 January 2012, by Thierry Vignaud + +- enable autologin on all consoles +- include mkfs.nilfs2 & nilfs-tune + +Version 1.29 - 25 January 2012, by Thierry Vignaud + +- drop support for squashfs3 +- enable rescue through serial line (mga#2052) +- fix mounting / (mga#3327) +- fix mounting / on LV +- fix mounting / on soft RAID or crypted LV (mga#3778 & mga#448) +- include xz for xz modules +- mount /proc in chroot +- only consider fstab from the selected fs +- switch to udev + +Version 1.28 - 15 January 2012, by Thierry Vignaud + +- use init from drakx-installer-sysvinit instead of system one + +Version 1.27 - 28 October 2011, by Thomas "tmb" Backlund + +- clean up genpasswd (AL13N) +- add gdisk for GPT partitioning support (#1023) + +Version 1.26 - 24 October 2011, by Thomas "tmb" Backlund + +- add dropbear ssh support to rescue mode (AL13N, mga #1023) + * add screen, dropbear, dropbearkey, genpasswd and startssh + * add /etc/shells +- add partprobe tool from parted (9k) + +Version 1.25.1 - 05 August 2011, by Thierry Vignaud + +- fix build with perl-5.14 + +Version 1.25 - 05 August 2011, by Thierry Vignaud + +- add missing libfuse.so.2 for mount.ntfs-3g (#1189) +- prefer Mageia root partitions over Mdv ones (#1320) + +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 index cec7b82ba..ae924a86e 100644 --- a/rescue/aliases +++ b/rescue/aliases @@ -1,6 +1,9 @@ -/bin/zcat gzip -/bin/gunzip gzip -/bin/vi vim-minimal -/sbin/lsmod lsmod-25 -/sbin/rmmod rmmod-25 -/sbin/insmod insmod-25 +/bin usr/bin +/sbin usr/sbin +/lib usr/lib +/usr/bin/vi vim-minimal +/usr/sbin/init ../lib/systemd/systemd +/usr/lib/modules ../../modules +/usr/lib/systemd/system/default.target rescue.target +/usr/lib/systemd/system/rescue.target.wants/sockets.target ../sockets.target +/usr/lib/systemd/system/dbus-org.freedesktop.machine1.service systemd-machined.service diff --git a/rescue/drvinst b/rescue/bin/drvinst index 78c6f5c74..4868b42e0 100755 --- a/rescue/drvinst +++ b/rescue/bin/drvinst @@ -12,35 +12,26 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -use lib qw(../perl-install /usr/lib/libDrakX); +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'); - } + print STDERR qq(Installing driver $driver (for "$descr")\n); + system("/sbin/modprobe", $driver) and print "\tfailed\n"; } #- start foreach my $card (detect_devices::pci_probe()) { + # ignoring "unknown", "Card:foobar" and the like as well as video cards: $card->{driver} eq 'unknown' || $card->{driver} =~ /:/ and next; $card->{media_type} eq "DISPLAY_VGA" and next; + # load drivers for selected categories or for everything if no args: if (!@ARGV || find { $card->{media_type} =~ /$_/i } @types) { install_module($card->{driver}, $card->{description}); } diff --git a/rescue/bin/guessmounts b/rescue/bin/guessmounts new file mode 100755 index 000000000..494f98f44 --- /dev/null +++ b/rescue/bin/guessmounts @@ -0,0 +1,168 @@ +#!/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 devices; +use fs; +use fs::dmcrypt; +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); + +{ + local $::isInstall = 1; # so that detect_during_install() got called by init: + lvm::init(); +} +fs::dmcrypt::init; + +my @parts = map { + $_->{device} = delete $_->{dev}; + put_in_hash($_, fs::type::type_subpart_from_magic($_)); +} fs::proc_partitions::read_raw(); + +# Basically doing fsedit::raids(): +my ($raid_parts, $normal_parts) = partition { isRawRAID($_) } @parts; + +if (@$raid_parts) { + require raid; + raid::detect_during_install(@$raid_parts); + my $raids = raid::get_existing(@$raid_parts); + push @$normal_parts, @$raids; +} + +# Basically doing fsedit::dmcrypts(): +(my $luks_parts, $normal_parts) = partition { isRawLUKS($_) } @$normal_parts; +if (@$luks_parts) { + use interactive; + use interactive::curses; + require diskdrake::interactive; + my $in = interactive->vnew('su'); + my $all_hds = fsedit::get_hds({}, $in); + # Unlocking them in order to look at their fs (do they hold a Mageia installation): + foreach my $part (@$luks_parts) { + diskdrake::interactive::dmcrypt_open($in, undef, $part, $all_hds); + } + my @dmcrypts = fs::dmcrypt::get_existing(@$luks_parts); + push @$normal_parts, @dmcrypts; +} + +my @roots; + +my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch(); +foreach (@$normal_parts) { + my $dev = devices::make($_->{device}); + + my $fs = $_->{fs_type}; + member($fs, fs::type::true_local_fs_types()) or next; + system("mount -t $fs $dev $target 2>/dev/null"); + + if (my $release_file = common::release_file($target)) { + my @fstab = fs::read_fstab($target, '/etc/fstab'); + my $h = common::parse_release_file($target, $release_file, $_); + add2hash($h, { dev => $dev, fs => $fs, fstab => \@fstab, + pretty_name => "$h->{release} $h->{version} $h->{arch} on $dev" }); + my $release = chomp_(cat_("$target$release_file")); + printf STDERR "=> found a %s root partition on $dev\n=> type $fs, version `$release'\n", $h->{release}; + # Offer to rescue only same arch: + $h->{pretty_name} .= " (cannot be rescued: $h->{arch} ne $arch;)" if $h->{arch} ne $arch; + push @roots, $h; + } + system('umount', $target) == 0 or die "error unmounting $target\n"; +} + +my ($root, $fs, @fstab); + +# Try Mageia first: +if (@roots) { + # Order by release number: + @roots = sort { $b->{version} cmp $a->{version} } @roots; + # Then pick mga over mdv: + @roots = map { @$_ } partition { $_->{release} =~ /Mageia/ } @roots; + + my $selected; + if (@roots == 1) { + $selected = first(@roots); + } else { + print "\n\nWhich system do you want to rescue?\n0: Abort\n"; + each_index { print $::i + 1, ": $_->{pretty_name}\n" } @roots; + my $res; + while ($res < 1 || $res > @roots) { + print "what is your choice (type the number of your selection or C^c to abort)?\n"; + $res = <>; + chomp($res); + if ($res eq "0") { + print "Aborting\n"; + exit(1); + } + } + $selected = $roots[$res-1]; + } + + $root = $selected->{dev}; + $fs = $selected->{fs}; + @fstab = @{$selected->{fstab}}; + print STDERR "=> Selecting $root as root fs\n"; +} + +if ($root) { + system("mount -t $fs $root $target 2>/dev/null"); + + 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(qw(mount -t proc proc), "$target/proc"); + foreach (qw(/dev /run)) { + system('mount', '--bind', $_, "$target/$_"); + } + system(qw(mount -t sysfs sysfs), "$target/sys"); + system(qw(mount -t efivarfs efivarfs), "$target/sys/firmware/efi/efivars") if is_uefi(); + 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/bin/install_bootloader index 24ab7e382..3eeb7a65e 100755 --- a/rescue/install_bootloader +++ b/rescue/bin/install_bootloader @@ -12,25 +12,26 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -use lib qw(../perl-install /usr/lib/libDrakX); +use lib qw(/usr/lib/libDrakX); use common; use bootloader; use fs; +my $auto; if ($ARGV[0] eq '--auto') { $auto = shift @ARGV; } $::prefix = '/mnt'; -my $release = common::mandrake_release($::prefix) || +my $release = common::mageia_release($::prefix) || do { system('guessmounts') == 0 or die 'guessmounts failed'; - common::mandrake_release($::prefix); + common::mageia_release($::prefix); }; if ($release) { - $release =~ /Mandrake|Mandriva/ or die "release file doesn't contain 'Mandriva', exiting.\n"; + $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 { @@ -59,7 +60,7 @@ if (@main_methods == 0) { 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 Mandriva Linux distribution:\n\t", +print "About to re-install Boot Loader $main_method of following Mageia distribution:\n\t", $release, "\n"; if (!$auto) { print "=> ok? <press Enter to continue, 'n' and Enter to cancel> "; diff --git a/rescue/lsparts b/rescue/bin/lsparts index 9f0fac925..a1855a21e 100755 --- a/rescue/lsparts +++ b/rescue/bin/lsparts @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Main author Pascal Rigaux (pixel@mandriva.com) +# Main author Pascal Rigaux (pixel) # Put together by Guillaume Cottenceau # # Copyright 1999-2005 Mandriva @@ -16,7 +16,7 @@ # Detects partition types using signatures # -use lib qw(../perl-install /usr/lib/libDrakX); +use lib qw(/usr/lib/libDrakX); use common; use fs::type; use fs::proc_partitions; @@ -38,8 +38,9 @@ foreach (fs::proc_partitions::read_raw()) { print STDERR "$err\n" if $verbose; } else { $_->{device} = $_->{dev}; + local $::isStandalone = 1; # silent run_program 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); + printf "$_->{dev}: %6s, fs %s (%s) [%s]\n", formatXiB($_->{size} * 1024), $type->{fs_type}, fs::type::part2type_name($type), $type->{device_LABEL}; } } } diff --git a/rescue/rescue-doc b/rescue/bin/rescue-doc index fa03d1be3..e6514b462 100755 --- a/rescue/rescue-doc +++ b/rescue/bin/rescue-doc @@ -1,6 +1,7 @@ #!/usr/bin/perl -sub output { my $f = shift; local *F; open F, ">$f" or die "output in file $f failed: $!\n"; print F foreach @_; } +# From MDK::Common: +sub output { my $f = shift; open(my $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 @@ -13,15 +14,15 @@ 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 Mandriva detection/configuration libraries. +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 Mandriva Linux system than in this spartan "rescue -system" shell. Some of the most common problems include: +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 @@ -45,13 +46,9 @@ system is the right tool. Some common examples include: just modify what's necessary to boot into a running system, then complete the fix from there. -In case you have found a new problem which should be handled by -"rescue mode" but currently isn't, please report it to -<pixel@mandriva.com>. - -For more information on troubleshooting a Mandriva Linux system, +For more information on troubleshooting your system, please consult the official manuals, the documentation on -MandrivaLinux.com, MandrivaClub.org, or the MandrivaExpert.com support forum. +wiki.mageia.org or support forum at forum.mageia.org. <press 'q' (qwerty keyboard) to continue> )); diff --git a/rescue/restore_ms_boot b/rescue/bin/restore_ms_boot index b31fd112e..1f8cc2907 100755 --- a/rescue/restore_ms_boot +++ b/rescue/bin/restore_ms_boot @@ -12,15 +12,16 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -use lib qw(../perl-install /usr/lib/libDrakX); +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 = typeFromMagic(devices::make($_->{dev})); + my $type = partition_table::raw::typeOfMBR($_->{dev}); if_($type && member($type, bootloader::main_method_choices()) , [ $_->{dev}, $type ]); } fs::proc_partitions::read_raw(); diff --git a/rescue/devices.pl b/rescue/devices.pl deleted file mode 100644 index 79308508a..000000000 --- a/rescue/devices.pl +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/perl - -@ARGV == 1 && chdir $ARGV[0] or die "usage: devices.pl <dir>\n"; - -if ($>) { $sudo = "sudo"; $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; } - -foreach (<DATA>) { - chomp; - my ($typ, $maj, $min, @l) = split; - foreach (@l) { - my @l2 = do { - if (my ($prefix, $ini, $end) = /(.*)(\d+)-(\d+)$/) { - map { "$prefix$_" } $ini .. $end; - } else { - $_; - } - }; - system("$sudo mknod $_ $typ $maj " . $min++) foreach @l2; - } -} - -__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 index e6d5a5d47..1b1153926 100644 --- a/rescue/dirs +++ b/rescue/dirs @@ -1,6 +1,9 @@ -/lib +/dev +/proc +/run +/sys /tmp +/usr/bin +/usr/sbin +/usr/lib/systemd/system/rescue.target.wants /modules -/proc -/dev -/dev/pts diff --git a/rescue/guessmounts b/rescue/guessmounts deleted file mode 100755 index 3f3a4e208..000000000 --- a/rescue/guessmounts +++ /dev/null @@ -1,82 +0,0 @@ -#!/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(../perl-install /usr/lib/libDrakX); -use common; -use fs; -use fs::proc_partitions; - - -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); - -my @fstab; -my $root; - -foreach (fs::proc_partitions::read_raw()) { - my $dev = devices::make($_->{dev}); - - 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 Mandriva Linux 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} || $valued_options->{supermount} - || $_->{mntpoint} eq '/' - || member($_->{fs_type}, 'swap', 'nfs', 'ntfs'); - - 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}"; - mkdir_p($where); - print STDERR "\t$_->{device} on $where type $_->{fs_type} options $_->{options}\n"; - system("mount -t $_->{fs_type} /dev/$_->{device} $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/list.xml b/rescue/list.xml index 65f04a8c5..50656352e 100644 --- a/rescue/list.xml +++ b/rescue/list.xml @@ -7,7 +7,7 @@ pwd reset ls - cp ln mkdir mknod mv rm rmdir + cp ln mkdir mknod mv rm rmdir chmod chown dd touch @@ -20,70 +20,94 @@ find file md5sum - gzip <!-- zcat and gunzip are hardlinks, they are handled in aliases to make it more apparent --> + gzip zcat gunzip xz bzip2 bunzip2 bzcat df du - packdrake parsehdlist + packdrake cpio ftp tar rsync ssh scp telnet + host date dmesg chroot sleep - sync update + sync eject - mount umount + mount mount.nfs umount + losetup ldconfig - mingetty init + mingetty agetty reboot halt shutdown - kill killall5 ps strace + kill ps strace + sed tr + strings loadkeys tset stty ping hostname ifconfig route fdformat badblocks - e2fsck fsck.ext2 fsck.ext3 mke2fs mkfs.ext2 resize2fs - debugfs dumpe2fs tune2fs - fsck.xfs xfs_repair - resize_reiserfs reiserfsck mkswap swapoff swapon - <if ARCH="i.86"> - fsck.jfs - </if> - <if ARCH="i.86|x86_64|ia64"> - ntfsresize - mkdosfs - </if> - <if ARCH="ppc"> - hformat - </if> + 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_growfs xfs_repair fsck.xfs + xfs_freeze xfs_io <!-- needed for setup grub on XFS formated / --> + xfs_db <!-- needed by xfs_admin for setting UUID --> + mkfs.ntfs mkdosfs dosfslabel mkntfs ntfsresize ntfslabel + mkfs.nilfs2 nilfs-tune - <if-not ARCH="ppc"> - fdisk gpart sfdisk - rescuept - </if-not> - <if ARCH="ppc"> - pdisk + mkfs.btrfs btrfs btrfsck fsck.btrfs btrfstune + btrfs-map-logical btrfs-convert + mkfs.f2fs fsck.f2fs resize.f2fs + + dropbear dropbearkey + screen + + gdisk + + <if ARCH="i.86|x86_64"> + mkfs.jfs fsck.jfs jfs_tune </if> + quotacheck + cryptsetup dmsetup + + fdisk gpart + testdisk photorec + + sfdisk + dump dump.ext2 restore restore.ext2 dump.ext3 restore.ext3 dump.xfs restore.xfs - parted partimage + parted partimage partprobe + + udevadm mdadm lvm2 - <if ARCH="i.86|x86_64|ia64"> + <!-- symlinks --> + lvconvert lvcreate lvchange lvdisplay lvextend lvmconfig lvmdiskscan lvmsadc lvmsar lvreduce lvremove lvrename lvresize lvs lvscan + pvck pvcreate pvchange pvdisplay pvmove pvremove pvresize pvs pvscan + vgcfgbackup vgcfgrestore vgck vgconvert vgcreate vgchange vgdisplay vgexport vgextend vgimport vgimportclone vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan vgsplit + + mdmon kpartx + dmevent_tool + dmeventd + <if ARCH="i.86|x86_64"> dmraid </if> - lsmod-25 - insmod-25 - rmmod-25 + lsmod + insmod + rmmod + modprobe setserial mt stinit @@ -92,45 +116,46 @@ rpm rpm2cpio rpmdb - rpme rpmi rpmu rpmquery rpmverify + rpmquery rpmverify vim-minimal hexedit perl + uniq + wget - <if ARCH="i.86|x86_64|ia64"> + awk clear dialog wc + setterm + + <if ARCH="i.86|x86_64"> dmidecode </if> <if ARCH="i.86|x86_64"> grub grub-install </if> - <if ARCH="ia64"> + <if ARCH="x86_64"> efibootmgr </if> - <if ARCH="ppc"> - ybin - mkofboot ofpath - nvsetenv - </if> - <if ARCH="sparc"> - silo - </if> </from> <from> /usr/lib/kbd/keymaps/include - <if ARCH="i.86|x86_64"> + <if ARCH="i.86|x86_64"> /usr/lib/kbd/keymaps/i386/include - /usr/lib/kbd/keymaps/i386/azerty/be-latin1.kmap.gz <!-- this one is needed by be2-latin1 --> + /usr/lib/kbd/keymaps/i386/azerty/be-latin1.map.gz <!-- this one is needed by be2-latin1 --> </if> - /usr/share/misc/file/magic + /usr/share/misc/magic.mgc /usr/share/terminfo/l/linux + /usr/share/terminfo/s/screen /usr/share/pci.ids - /var/run/utmp + + <from expand="glob"> + /usr/LIB/ntfs-3g/* + </from> <if ARCH="i.86|x86_64"> - <from dir="/lib/grub/ARCH-mandriva" expand="glob"> + <from dir="/lib/grub/ARCH-mageia" expand="glob"> stage1 stage2 *_stage1_5 @@ -138,13 +163,8 @@ /usr/lib/extipl/aldebaran.bin </if> - <if ARCH="ppc"> - /usr/lib/yaboot/ofboot - /usr/lib/yaboot/yaboot - </if> - <from expand="command"> - perl -Mkeyboard -I../perl-install -le 'print foreach keyboard::loadkeys_files()' + perl -Mkeyboard -I/usr/lib/libDrakX -le 'print foreach keyboard::loadkeys_files()' </from> <if set="LANGUAGE_fr_FR"> @@ -161,7 +181,19 @@ /usr/share/locale/pt_BR /usr/share/locale/pt/LC_MESSAGES/partimage.mo </if> + <!-- needed by mlabel used during Flash upgrades --> + /usr/lib/gconv/IBM850.so + + /sbin/mount.ntfs-3g <!-- can not be expanded as binary, not executable for all users --> + /sbin/blkid +</from> + + +<from dir="/usr/LIB/device-mapper"> + <from expand="glob"> + *.so + </from> </from> <from dir="/usr/lib/rpm" expand="glob"> @@ -169,13 +201,13 @@ rpmrc macros rpmpopt-* - rpmd rpme rpmi rpmu rpmq rpmv </mode> </from> <filter subst="/^__END__/ and $_ = '', close ARGV"> <from expand="main-perl"> AutoLoader.pm + overload.pm <!-- required by File::Temp --> strict.pm vars.pm warnings/register.pm @@ -184,15 +216,37 @@ Exporter.pm File/Path.pm File/Basename.pm - ARCH-linux/re.pm - ARCH-linux/Cwd.pm - ARCH-linux/auto/Cwd/Cwd.so - ARCH-linux/CORE/libperl.so - ARCH-linux/auto/POSIX/autosplit.ix - ARCH-linux/auto/POSIX/load_imports.al - ARCH-linux/auto/POSIX/POSIX.so - ARCH-linux/POSIX.pm - ARCH-linux/XSLoader.pm + File/Temp.pm <!-- required by diskdrake::interactive --> + XSLoader.pm + Symbol.pm + SelectSaver.pm +</from> + +<from expand="main-perl-bin"> + re.pm + Cwd.pm + auto/Cwd/Cwd.so + auto/POSIX/POSIX.so + POSIX.pm + lib.pm + Socket.pm + IO/Socket.pm + IO.pm + IO/Handle.pm + Encode/Symbol.pm + Encode/Unicode.pm + auto/Encode/Unicode/Unicode.so + DynaLoader.pm + File/Spec.pm <!-- required by File::Temp --> + File/Spec/Unix.pm <!-- required by File::Spec --> + auto/IO/IO.so + auto/Socket/Socket.so + Errno.pm + IO/Socket/INET.pm + IO/Socket/UNIX.pm + List/Util.pm <!-- required by Scalar::Util --> + auto/List/Util/Util.so + Scalar/Util.pm <!-- required by File::Temp --> </from> <from expand="perl"> @@ -201,50 +255,206 @@ </from> </filter> +<from expand="rpm" matching="m!^/usr/(share|LIB)/perl5! and !/\.pod$/"> + perl-Curses <!-- required by Curses::UI --> + perl-Curses-UI <!-- required by interactive::curses --> +</from> + <from dir="/etc"> + mke2fs.conf + netconfig inputrc - termcap protocols services + shells ssh/ssh_config </from> +<from dir="/usr/lib/systemd"> + systemd + systemd-executor + systemd-fsck + systemd-journald + systemd-machined + systemd-modules-load + systemd-reply-password + systemd-shutdown + systemd-sysctl + systemd-udevd + systemd-vconsole-setup + system-generators/systemd-fstab-generator +</from> + +<from dir="/usr/lib/systemd/network"> + 99-default.link +</from> + +<from dir="/usr/lib/systemd/system"> + cryptsetup.target + dbus.service + dbus.socket + emergency.target + sysinit.target + basic.target + halt.target + kexec.target + local-fs.target + local-fs-pre.target + remote-fs.target + remote-fs-pre.target + network.target + nss-lookup.target + nss-user-lookup.target + poweroff.target + reboot.target + rescue.target + rpcbind.target + shutdown.target + final.target + sigpwr.target + sockets.target + swap.target + timers.target + paths.target + umount.target + kmod-static-nodes.service + systemd-tmpfiles-setup-dev.service + systemd-ask-password-console.path + systemd-udevd-control.socket + systemd-udevd-kernel.socket + systemd-ask-password-plymouth.path + systemd-journald.socket + systemd-ask-password-console.service + systemd-modules-load.service + systemd-halt.service + systemd-poweroff.service + systemd-reboot.service + systemd-kexec.service + systemd-fsck@.service + systemd-udevd.service + systemd-udev-trigger.service + systemd-udev-settle.service + systemd-ask-password-plymouth.service + systemd-journald.service + systemd-machined.service + systemd-vconsole-setup.service + + sysinit.target.wants/systemd-modules-load.service + sysinit.target.wants/systemd-ask-password-console.path + sysinit.target.wants/systemd-journald.service + sockets.target.wants/dbus.socket + sockets.target.wants/systemd-udevd-control.socket + sockets.target.wants/systemd-udevd-kernel.socket + sockets.target.wants/systemd-journald.socket + sysinit.target.wants/systemd-udevd.service + sysinit.target.wants/systemd-udev-trigger.service + sysinit.target.wants/kmod-static-nodes.service + sysinit.target.wants/systemd-tmpfiles-setup-dev.service + + ctrl-alt-del.target + syslog.socket + + slices.target +</from> + +<from expand="binary"> + journalctl systemctl echo swapoff systemd-cgls systemd-tmpfiles systemd-nspawn dbus-daemon machinectl +</from> + +<from> + /etc/dbus-1/system.conf + /usr/share/dbus-1/system.d/org.freedesktop.systemd1.conf + /usr/share/dbus-1/system.d/org.freedesktop.machine1.conf + /usr/share/dbus-1/system-services/org.freedesktop.systemd1.service + /usr/share/dbus-1/system-services/org.freedesktop.machine1.service +</from> + +<from dir="/usr/lib/udev"> + ata_id + scsi_id +</from> + +<from dir="/usr/lib/udev/hwdb.d"> + <from expand="glob"> + *.hwdb + </from> +</from> + +<from dir="/usr/lib/udev/rules.d"> + 10-dm.rules + 11-dm-lvm.rules + 13-dm-disk.rules + 50-udev-default.rules + 60-persistent-storage.rules + 63-md-raid-arrays.rules + 64-md-raid-assembly.rules + 75-net-description.rules + 80-drivers.rules + 80-net-setup-link.rules + 95-dm-notify.rules +</from> + + <filter command="strip"> + <!-- 32bit grub needs 32 bit loader --> + <if ARCH="x86_64"> + <from dir="/lib"> + ld-linux*.so.2 + </from> + </if> <from dir="/LIB"> libnss_files.so.2 libnss_dns.so.2 libresolv.so.2 ld-linux*.so.2 + <!-- needed for mount.ntfs-3g --> + libfuse.so.2 + + <!-- needed by dmraid --> + libdmraid-events-isw.so </from> </filter> <from dir="/usr/share/ldetect-lst" expand="glob"> *table.gz + dkms-modules.alias fallback-modules.alias </from> -<from dir="../kernel/all.kernels/$(MAIN_KERNEL)"> - <to dir="/modules"> - modules.cz - modules.dep - </to> +<from dir="/lib/module-init-tools"> + ldetect-lst-modules.alias </from> <filter command="../tools/simplify-drakx-modules"> - <from dir="." expand="collect-perl-files ../perl-install /usr/lib/libDrakX"> - <to dir="/usr/bin"> - rescue-doc drvinst lsparts - guessmounts install_bootloader + <from dir="." expand="collect-perl-files /usr/lib/libDrakX /usr/lib/libDrakX"> + <to dir="/usr"> + bin/rescue-doc + bin/drvinst + bin/lsparts + bin/guessmounts + bin/install_bootloader <if ARCH="i.86|x86_64"> - restore_ms_boot + bin/restore_ms_boot </if> </to> - <to dir="/usr/sbin"> - partimage_whole_disk + <to dir="/usr"> + sbin/partimage_whole_disk </to> </from> + <!-- Those are listed b/c collect-perl-files failed to detect them: --> + <from dir="/usr/lib/libDrakX" expand="glob"> + interactive.pm <!-- required by diskdrake::interactive --> + interactive/curses.pm <!-- required by interactive --> + diskdrake/interactive.pm <!-- required by guessmount --> + fs/dmraid.pm <!-- required by fsedit --> + fs/remote.pm <!-- required by fs::remote::* --> + fs/remote/davfs.pm <!-- required by fs --> + fs/remote/smb.pm <!-- required by fs --> + partition_table/*.pm <!-- required by partimage_whole_disk --> + raid.pm <!-- required when needed in guessmounts --> + </from> </filter> -<from dir="../mdk-stage1"> +<from dir="/usr/LIB/drakx-installer-binaries"> <to dir="/usr/bin"> rescue-gui </to> @@ -252,5 +462,21 @@ dhcp-client </to> </from> +<if set="RESCUE_FLASH"> + <from expand="binary"> + dirname + losetup + mlabel + nash + pv + sed + usleep + </from> + <from dir="Flash/scripts" expand="glob"> + <to dir="/usr/bin"> + * + </to> + </from> +</if> </list> diff --git a/rescue/make_flash_rescue b/rescue/make_flash_rescue Binary files differnew file mode 100755 index 000000000..2f7ce8584 --- /dev/null +++ b/rescue/make_flash_rescue diff --git a/rescue/make_partimage_save_rest_all b/rescue/make_partimage_save_rest_all index 20d0673b6..929ffd2c1 100755 --- a/rescue/make_partimage_save_rest_all +++ b/rescue/make_partimage_save_rest_all @@ -1,15 +1,16 @@ #!/bin/sh [ $# -lt 1 ] && { - echo "usage: make_partimage_save_rest_all <partimage special rpm> [<partimage dir> <data dirs>]" ; + echo "usage: make_partimage_save_rest_all <partimage server> [<partimage dir> <data dirs>]" ; exit 1 } -rpm=$1 ; shift +server=$1 ; shift partimage_dir=$1 ; shift +data_dir=$1 ; shift if [ -n "$partimage_dir" ]; then - first_data_dir="$partimage_dir$1" + first_data_dir="$partimage_dir$data_dir" [ -d "$first_data_dir" ] || { echo "can't find $first_data_dir" @@ -23,11 +24,11 @@ fi rm -rf .tmp mkdir -p .tmp/isolinux -cp -f /usr/lib/syslinux/isolinux.bin ../isolinux/alt0/* .tmp/isolinux +cp -f /usr/lib/syslinux/isolinux.bin ../images/isolinux/alt0/* .tmp/isolinux -PARTIMAGE_DIR="$@" PARTIMAGE_RPM=$rpm DISTRIB_DESCR="partimage save/restore all" ./make_rescue_img || exit 1 +DISTRIB_DESCR="partimage save/restore all" ./make_rescue_img || exit 1 mkdir -p .tmp/install/stage2 -mv -f rescue.clp .tmp/install/stage2 +mv -f rescue.sqfs .tmp/install/stage2 common_para="rescue automatic=method:cdrom" # hda=4864,255,63 acpi=ht @@ -41,24 +42,22 @@ timeout 150 label save_all kernel vmlinuz - append initrd=all.rdz $common_para save_all + append initrd=all.rdz $common_para save_all pserver=$server label rest_all kernel vmlinuz - append initrd=all.rdz $common_para rest_all keepmounted + 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 - for i in $*; do - dir=`dirname $i` - mkdir -p .tmp$dir - ln -s $partimage_dir$i .tmp$dir - done + dir=`dirname $data_dir` + mkdir -p .tmp$dir + ln -s $partimage_dir$data_dir .tmp$dir fi - mkisofs -f -o part_$action.iso -r -J -hide-rr-moved -nobak -cache-inodes -publisher Mandriva -V 'mdk part save/rest' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table .tmp + 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 diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index a7d690101..8e3f64334 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -1,16 +1,13 @@ #!/usr/bin/perl use MDK::Common; -use lib "../perl-install"; +use lib "/usr/lib/libDrakX"; use keyboard; -my $lib = (arch() =~ /x86_64/ ? "lib64" : "lib"); my $tmp = "/tmp/rescue_tmp"; -my $rescue = "rescue.clp"; +my $rescue = "rescue.sqfs"; -my $sudo = ''; if ($>) { - $sudo = "sudo"; $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; } @@ -18,102 +15,53 @@ BEGIN { undef *_ } sub __ { print @_, "\n"; system(@_) } sub _ { __ @_; $? and die } -sub installown($$) { - my ($own, $dir) = @_; - return if -e "$tmp$dir/" . basename($own); - mkdir_p("$tmp$dir"); - _ "cp -rL $own $tmp$dir"; +my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch(); +_ "rm -rf $tmp" if -e $tmp; +_ "mkdir -p $tmp"; +_ "cp -a tree/* $tmp"; +_ "find $tmp -name '*~' -delete"; +mkdir_p($tmp . chomp_($_)) foreach cat_("dirs"); +foreach (cat_("aliases")) { + chomp; my ($f, $dest) = split; + symlink $dest, "$tmp$f"; } - -sub install_perl_script { - my ($script, $dir) = @_; - my @gi_modules; - foreach (`../tools/get-needed-drakx-modules ../perl-install /usr/lib/libDrakX $script`) { - chomp; - my ($local, $dest) = split "\t"; - installown($local, dirname($dest || $local)); - push @gi_modules, "$tmp$dest" if $dest; - } - installown($script, $dir); - system('../tools/simplify-drakx-modules', @gi_modules, "$tmp$dir/$script"); +if ($arch eq "x86_64") { + _ "mkdir $tmp/usr/lib64"; + _ "ln -s usr/lib64 $tmp/lib64"; } - -_ "$sudo 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 'CVS*' | xargs rm -rf"; -_ "perl devices.pl $tmp/dev"; -_ "mkfifo $tmp/dev/initctl"; substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue"; -{ - _ "cd ../mdk-stage1 && make rescue-gui dhcp-client"; - -e "../kernel/all.kernels" or die "use ./update_kernel in gi/kernel first\n"; +_ "../tools/install-xml-file-list list.xml $tmp"; - $ENV{MAIN_KERNEL} = chomp_(`cat ../kernel/RPMS/.main`); - - _ "../tools/install-xml-file-list list.xml $tmp"; -} +_ "sed 's/Mageia \\([0-9]*\\)/Mageia Rescue \\1/' /etc/os-release >$tmp/etc/os-release"; +_ "ls -1 $tmp/etc | sed 's,\\(.*\\),/etc/\\1,' >>$tmp/usr/share/symlinks"; +# Loading the floppy module causes this service to fail so lets mask this to +# prevent a red "FAILED" briefly showing on the screen +_ "sed -i s/ExecStart=/ExecStart=-/ $tmp/usr/lib/systemd/system/systemd-modules-load.service"; my %keytable_conflicts; -my @less_important_keytables = qw(am_old am_phonetic no-dvorak fr_CH-latin1); -foreach (keyboard::loadkeys_files()) { +my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1); +foreach (keyboard::loadkeys_files(sub { warn @_ })) { my ($dir, $fname) = (dirname($_), basename($_)); - my ($name) = $fname =~ /(.*)\.kmap\.gz/ or next; + my ($name) = $fname =~ /(.*)\.map\.gz/ or next; next if member($name, @less_important_keytables); - if (my ($short) = $name =~ m|(.+?)[\W_]|) { + 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.kmap.gz"); + 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"; -} - -if ($ENV{PARTIMAGE_RPM}) { - - _ "rpm2cpio $ENV{PARTIMAGE_RPM} | (cd $tmp ; cpio -idu ./usr/sbin/partimage)"; - my $server = 'partimaged'; - $server = 'leia'; - - my $default_dir = '/data/box'; - my $partimage_dir = $ENV{PARTIMAGE_DIR} || $default_dir; - my @local_dirs = map { "/tmp/image$_" } split(' ', $partimage_dir); - my $local_dir = $local_dirs[0]; - my $local_dirs = join(' ', @local_dirs); - - substInFile { - $_ = <<EOF if /^\s*rescue-gui/; - if grep -q save_all /proc/cmdline; then - partimage_whole_disk -s $server save_all $default_dir - fi - if grep -q rest_all /proc/cmdline; then - if [ -d $local_dir ]; then - partimage_whole_disk rest_all $local_dirs - else - partimage_whole_disk -s $server rest_all $partimage_dir - fi - fi -EOF - } "$tmp/etc/rc.sysinit"; + } "$tmp/usr/bin/mageia-rescue"; } -_ "$sudo chown root.root -R $tmp/*"; - exit 0 if $ARGV[0]; -_ "mkisofs -quiet -D -R $tmp | create_compressed_fs - 65536 $rescue 200 2>/dev/null"; -#_ "$sudo rm -rf $tmp"; +_ "mksquashfs $tmp $rescue -all-root -noappend >/dev/null"; +_ "chmod 755 $rescue"; +#_ "rm -rf $tmp"; diff --git a/rescue/partimage_whole_disk b/rescue/sbin/partimage_whole_disk index bf0360379..ed0653a95 100755 --- a/rescue/partimage_whole_disk +++ b/rescue/sbin/partimage_whole_disk @@ -1,6 +1,6 @@ #!/usr/bin/perl -use lib qw(/usr/lib/libDrakX ../perl-install); +use lib qw(/usr/lib/libDrakX); use standalone; use fsedit; use fs::format; @@ -12,9 +12,6 @@ use common; use partition_table::empty; use Carp::Heavy; -#- help getting the file in make_rescue_img -BEGIN { partition_table::raw::default_type() } - my %options = ( save_home_directory => 1, empty_space_at_end_of_disk => 0, # 300 * 1024 * 2, # 300MB @@ -28,12 +25,12 @@ if ($ARGV[0] eq '-s') { } my $action = shift @ARGV; -sub usage() { die "partimage_whole_disk [-s <server>] (save_all <dir> | rest_all <dirs>)\n" } +sub usage() { die "partimage_whole_disk [-s <server>] (save_all <dir> | rest_all <dir>)\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)); +my @partimage_cmd = ('partimage', if_($server, '-s', $server, '-n', '-L')); @ARGV == 1 or usage(); @@ -66,7 +63,7 @@ sub save_all { my $part_list = [ partition_table::get_normal_parts($hd) ]; foreach (@$part_list) { - $_->{saved} = !member($_->{fs_type}, 'ntfs', 'vfat', 'swap'); + $_->{saved} = !member($_->{fs_type}, 'ntfs', 'ntfs-3g', 'vfat', 'swap'); } if (!$options{save_home_directory}) { @@ -103,7 +100,7 @@ sub rest_all { 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') } @$other; + my ($from_resize, $created) = partition { member($_->{fs_type}, 'vfat', 'ntfs', 'ntfs-3g') } @$other; my $total = sum(map { $_->{size} } @$part_list); if ($total > $hd->{totalsectors}) { diff --git a/rescue/tree/bin/insmod b/rescue/tree/bin/insmod deleted file mode 100755 index 49b298142..000000000 --- a/rescue/tree/bin/insmod +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -echo "Use modprobe instead" diff --git a/rescue/tree/etc/hostname b/rescue/tree/etc/hostname new file mode 100644 index 000000000..344f71bc8 --- /dev/null +++ b/rescue/tree/etc/hostname @@ -0,0 +1 @@ +rescue diff --git a/rescue/tree/etc/hosts b/rescue/tree/etc/hosts index a9bbdee7f..d02c36416 100644 --- a/rescue/tree/etc/hosts +++ b/rescue/tree/etc/hosts @@ -1 +1 @@ -127.0.0.1 mandrake-rescue +127.0.0.1 mageia-rescue diff --git a/rescue/tree/etc/inittab b/rescue/tree/etc/inittab deleted file mode 100644 index 771d7c0d4..000000000 --- a/rescue/tree/etc/inittab +++ /dev/null @@ -1,14 +0,0 @@ -#Inittab for Mandrake Rescue Disk -#Author: Daouda Lo <daouda@mandrakesoft.com> -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 index 2bbd2b38a..11f9f3102 100644 --- a/rescue/tree/etc/issue +++ b/rescue/tree/etc/issue @@ -11,7 +11,7 @@ [1;30;44m [40m [47m [40m [44m [40m[2[1;37;4[0m [1;30;44m [40m [47m [40m [30;44m [40m[2C[1;37;40m[0m [1;30;44m [40m [47m [40m [2C[1;37;40m[0m -[1;30;44m [40m [47m [40m [2C[1;37;40mMandriva Linux Rescue Disk[0m +[1;30;44m [40m [47m [40m [2C[1;37;40mMageia Linux Rescue Disk[0m [1;30;44m [43m [30;47m [43m [40m [2C[1;37;40m[0m [1;30;44m [43m [47m [43m [40m [2C [1;30;44m [43m [47m [43m [40m[2C @@ -24,5 +24,7 @@ Use [1;33;40mloadkeys[0m to change your keyboard layout (eg: loadkeys fr) Use [1;33;40mmodprobe[0m to load modules (eg: modprobe snd-card-fm801) Use [1;33;40mdrvinst[0m to install drivers according to detected devices Use [1;33;40mlsparts[0m to list your partitions with types +Use [1;33;40mstartssh[0m to start an ssh daemon Use [1;33;40mrescue-gui[0m to go back to the rescue menu +Use [1;33;40mgrabjournallogs[0m to grab the last 24 hours of journal logs diff --git a/rescue/tree/etc/passwd b/rescue/tree/etc/passwd index 568451e4e..c0274a116 100644 --- a/rescue/tree/etc/passwd +++ b/rescue/tree/etc/passwd @@ -1,3 +1,2 @@ -root::0:0::/:/bin/bash -shutdown:*:6:0:shutdown:/sbin:/sbin/shutdown -halt:*:7:0:halt:/sbin:/sbin/halt +root::0:0::/root:/bin/bash +messagebus:x:1:1::/:/sbin/nologin diff --git a/rescue/tree/etc/profile b/rescue/tree/etc/profile index 3b5ac21cc..17f0700dc 100644 --- a/rescue/tree/etc/profile +++ b/rescue/tree/etc/profile @@ -1,12 +1,12 @@ # /etc/profile -# (c) Mandrakesoft, Chmouel Boudjnah <chmouel@mandrakesoft.com> +# (c) Mandrakesoft, Chmouel Boudjnah <chmouel> # 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 +PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sbin:/mnt/bin:/mnt/usr/sbin:/mnt/usr/bin PS1="[root@rescue \w]\\$ " ls () { /bin/ls --color=auto -F "$@";} diff --git a/rescue/tree/etc/rc.reboot b/rescue/tree/etc/rc.reboot deleted file mode 100755 index 0b67416f1..000000000 --- a/rescue/tree/etc/rc.reboot +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 deleted file mode 100755 index 893efb338..000000000 --- a/rescue/tree/etc/rc.sysinit +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -action() { echo $1; shift; $*; } - -export PATH=/bin:/sbin:/usr/bin:/usr/sbin - -echo -e "\t\t\tWelcome to \\033[1;36mMandriva\\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 /mnt /var/log - -mkdir /proc -action "Mounting proc filesystem" mount -n -t proc /proc /proc - -if grep -q sysfs /proc/filesystems; then - mkdir /sys - action "Mounting sysfs on /sys" mount -t sysfs none /sys -fi - ->/etc/mtab -mount -f / -mount -f /proc - -#- free up stage1 memory -umount /stage1/proc/bus/usb /stage1/proc /stage1 - -# 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-mod -load ide-probe -load ide-disk -load ide-cd -load floppy -load af_packet -load isofs -load vfat -load ext3 -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 - -if grep ka /proc/cmdline; then - echo Welcome to Ka rescue - drvinst - cd /ka - ./install.sh -fi - -if ! grep -q expert /proc/cmdline; then - rescue-gui -fi diff --git a/rescue/tree/ka/gen_modules_conf.pl b/rescue/tree/ka/gen_modules_conf.pl deleted file mode 100644 index ae6c5bec6..000000000 --- a/rescue/tree/ka/gen_modules_conf.pl +++ /dev/null @@ -1,191 +0,0 @@ -$kinds2all_modules = { - 'usb' => [ - 'usb-uhci', - 'usb-ohci', - 'ehci-hcd' - ], - 'network' => [ - '3c501', - '3c503', - '3c505', - '3c507', - '3c509', - '3c515', - '3c90x', - '82596', - 'abyss', - 'ac3200', - 'acenic', - 'aironet4500_card', - 'at1700', - 'atp', - 'com20020-pci', - 'cs89x0', - 'de600', - 'de620', - 'defxx', - 'depca', - 'dgrs', - 'dmfe', - 'e100', - 'e2100', - 'eepro', - 'eepro100', - 'eexpress', - 'epic100', - 'eth16i', - 'ewrk3', - 'hamachi', - 'hp', - 'hp-plus', - 'hp100', - 'ibmtr', - 'lance', - 'natsemi', - 'ne', - 'ne2k-pci', - 'ni5010', - 'ni52', - 'ni65', - 'nvnet', - 'olympic', - 'pcnet32', - 'plip', - 'rcpci', - 'sb1000', - 'sis900', - 'smc-ultra', - 'smc9194', - 'starfire', - 'tlan', - 'tmspci', - 'tulip', - 'via-rhine', - 'wd', - 'winbond-840', - 'forcedeth', - 'fealnx', - '3c990', - '3c990fx', - 'b44', - 'bcm4400', - 'skfp', - 'tc35815', - 'lanstreamer', - 'farsync', - 'sdladrv', - 'prism2_plx', - 'iph5526', - '3c59x', - '8139too', - '8139cp', - 'sundance', - 'catc', - 'CDCEther', - 'kaweth', - 'pegasus', - 'rtl8150', - 'usbnet', - 'dl2k', - 'myri_sbus', - 'yellowfin', - 'ns83820', - 'r8169', - 'tg3', - 'e1000', - 'sk98lin', - 'bcm5820', - 'bcm5700' - ], - 'scsi' => [ - '3w-xxxx', - 'AM53C974', - 'BusLogic', - 'NCR53c406a', - 'a100u2w', - 'advansys', - 'aha152x', - 'aha1542', - 'aha1740', - 'atp870u', - 'dc395x_trm', - 'dtc', - 'g_NCR5380', - 'in2000', - 'initio', - 'pas16', - 'pci2220i', - 'psi240i', - 'fdomain', - 'qla1280', - 'qla2x00', - 'qlogicfas', - 'qlogicfc', - 'seagate', - 'wd7000', - 'sim710', - 'sym53c416', - 't128', - 'tmscsim', - 'u14-34f', - 'ultrastor', - 'eata', - 'eata_pio', - 'eata_dma', - 'mptscsih', - 'nsp32', - 'ata_piix', - 'sata_promise', - 'sata_svw', - 'sata_via', - '53c7,8xx', - 'aic7xxx', - 'aic7xxx_old', - 'aic79xx', - 'pci2000', - 'qlogicisp', - 'sym53c8xx', - 'lpfcdd', - 'DAC960', - 'dpt_i2o', - 'megaraid', - 'aacraid', - 'cciss', - 'cpqarray', - 'gdth', - 'i2o_block', - 'cpqfc', - 'qla2200', - 'qla2300', - 'pdc-ultra', - 'ips', - 'ppa', - 'imm' - ] - }; -my @l = map { /^(\S+)\s*:/ ? $1 : () } `lspcidrake`; - -my %kinds2modules = map { - $_ => [ intersection(\@l, $kinds2all_modules->{$_}) ]; -} qw(usb scsi); - -$kinds2modules{network} = [ - grep { - my $l = $_; - scalar grep { $_ eq $l } @{ $kinds2all_modules->{network} } - } @l -]; - -if (my @scsi = @{$kinds2modules{scsi}}) { - print "probeall scsi_hostadapter ", join(" ", @scsi), "\n"; -} -if (my @usb = @{$kinds2modules{usb}}) { - print "probeall usb-interface ", join(" ", @usb), "\n"; -} -my $eth = 0; -foreach (@{$kinds2modules{network}}) { - print "alias eth$eth $_\n"; - $eth++; -} - -sub intersection { my (%l, @m); @l{@{shift @_}} = (); foreach (@_) { @m = grep { exists $l{$_} } @$_; %l = (); @l{@m} = () } keys %l } diff --git a/rescue/tree/ka/hostnames b/rescue/tree/ka/hostnames deleted file mode 100644 index e30fac24a..000000000 --- a/rescue/tree/ka/hostnames +++ /dev/null @@ -1,225 +0,0 @@ -icluster1 129.88.96.1 -icluster2 129.88.96.2 -icluster3 129.88.96.3 -icluster4 129.88.96.4 -icluster5 129.88.96.51 -icluster6 129.88.96.6 -icluster7 129.88.96.7 -icluster8 129.88.96.8 -icluster9 129.88.96.9 -icluster10 129.88.96.10 -icluster11 129.88.96.11 -icluster12 129.88.96.12 -icluster13 129.88.96.13 -icluster14 129.88.96.14 -icluster15 129.88.96.15 -icluster16 129.88.96.16 -icluster17 129.88.96.17 -icluster18 129.88.96.18 -icluster19 129.88.96.19 -icluster20 129.88.96.20 -icluster21 129.88.96.21 -icluster22 129.88.96.22 -icluster23 129.88.96.23 -icluster24 129.88.96.24 -icluster25 129.88.96.25 -icluster26 129.88.96.26 -icluster27 129.88.96.27 -icluster28 129.88.96.28 -icluster29 129.88.96.29 -icluster30 129.88.96.30 -icluster31 129.88.96.31 -icluster32 129.88.96.32 -icluster33 129.88.96.33 -icluster34 129.88.96.34 -icluster35 129.88.96.35 -icluster36 129.88.96.36 -icluster37 129.88.96.37 -icluster38 129.88.96.38 -icluster39 129.88.96.39 -icluster40 129.88.96.40 -icluster41 129.88.96.41 -icluster42 129.88.96.42 -icluster43 129.88.96.43 -icluster44 129.88.96.44 -icluster45 129.88.96.45 -icluster46 129.88.96.46 -icluster47 129.88.96.47 -icluster48 129.88.96.48 -icluster49 129.88.96.49 -icluster50 129.88.96.50 -icluster51 129.88.96.51 -icluster52 129.88.96.52 -icluster53 129.88.96.53 -icluster54 129.88.96.54 -icluster55 129.88.96.55 -icluster56 129.88.96.56 -icluster57 129.88.96.57 -icluster58 129.88.96.58 -icluster59 129.88.96.59 -icluster60 129.88.96.60 -icluster61 129.88.96.61 -icluster62 129.88.96.62 -icluster63 129.88.96.63 -icluster64 129.88.96.64 -icluster65 129.88.96.65 -icluster66 129.88.96.66 -icluster67 129.88.96.67 -icluster68 129.88.96.68 -icluster69 129.88.96.69 -icluster70 129.88.96.70 -icluster71 129.88.96.71 -icluster72 129.88.96.72 -icluster73 129.88.96.73 -icluster74 129.88.96.74 -icluster75 129.88.96.75 -icluster76 129.88.96.76 -icluster77 129.88.96.77 -icluster78 129.88.96.78 -icluster79 129.88.96.79 -icluster80 129.88.96.80 -icluster81 129.88.96.81 -icluster82 129.88.96.82 -icluster83 129.88.96.83 -icluster84 129.88.96.84 -icluster85 129.88.96.85 -icluster86 129.88.96.86 -icluster87 129.88.96.87 -icluster88 129.88.96.88 -icluster89 129.88.96.89 -icluster90 129.88.96.90 -icluster91 129.88.96.91 -icluster92 129.88.96.92 -icluster93 129.88.96.93 -icluster94 129.88.96.94 -icluster95 129.88.96.95 -icluster96 129.88.96.96 -icluster97 129.88.96.97 -icluster98 129.88.96.98 -icluster99 129.88.96.99 -icluster100 129.88.96.100 -icluster101 129.88.96.101 -icluster102 129.88.96.102 -icluster103 129.88.96.103 -icluster104 129.88.96.104 -icluster105 129.88.96.105 -icluster106 129.88.96.106 -icluster107 129.88.96.107 -icluster108 129.88.96.108 -icluster109 129.88.96.109 -icluster110 129.88.96.110 -icluster111 129.88.96.111 -icluster112 129.88.96.112 -icluster113 129.88.96.113 -icluster114 129.88.96.114 -icluster115 129.88.96.115 -icluster116 129.88.96.116 -icluster117 129.88.96.117 -icluster118 129.88.96.118 -icluster119 129.88.96.119 -icluster120 129.88.96.120 -icluster121 129.88.96.121 -icluster122 129.88.96.122 -icluster123 129.88.96.123 -icluster124 129.88.96.124 -icluster125 129.88.96.125 -icluster126 129.88.96.126 -icluster127 129.88.96.127 -icluster128 129.88.96.128 -icluster129 129.88.96.129 -icluster130 129.88.96.130 -icluster131 129.88.96.131 -icluster132 129.88.96.132 -icluster133 129.88.96.133 -icluster134 129.88.96.134 -icluster135 129.88.96.135 -icluster136 129.88.96.136 -icluster137 129.88.96.137 -icluster138 129.88.96.138 -icluster139 129.88.96.139 -icluster140 129.88.96.140 -icluster141 129.88.96.141 -icluster142 129.88.96.142 -icluster143 129.88.96.143 -icluster144 129.88.96.144 -icluster145 129.88.96.145 -icluster146 129.88.96.146 -icluster147 129.88.96.147 -icluster148 129.88.96.148 -icluster149 129.88.96.149 -icluster150 129.88.96.150 -icluster151 129.88.96.151 -icluster152 129.88.96.152 -icluster153 129.88.96.153 -icluster154 129.88.96.154 -icluster155 129.88.96.155 -icluster156 129.88.96.156 -icluster157 129.88.96.157 -icluster158 129.88.96.158 -icluster159 129.88.96.159 -icluster160 129.88.96.160 -icluster161 129.88.96.161 -icluster162 129.88.96.162 -icluster163 129.88.96.163 -icluster164 129.88.96.164 -icluster165 129.88.96.165 -icluster166 129.88.96.166 -icluster167 129.88.96.167 -icluster168 129.88.96.168 -icluster169 129.88.96.169 -icluster170 129.88.96.170 -icluster171 129.88.96.171 -icluster172 129.88.96.172 -icluster173 129.88.96.173 -icluster174 129.88.96.174 -icluster175 129.88.96.175 -icluster176 129.88.96.176 -icluster177 129.88.96.177 -icluster178 129.88.96.178 -icluster179 129.88.96.179 -icluster180 129.88.96.180 -icluster181 129.88.96.181 -icluster182 129.88.96.182 -icluster183 129.88.96.183 -icluster184 129.88.96.184 -icluster185 129.88.96.185 -icluster186 129.88.96.186 -icluster187 129.88.96.187 -icluster188 129.88.96.188 -icluster189 129.88.96.189 -icluster190 129.88.96.190 -icluster191 129.88.96.191 -icluster192 129.88.96.192 -icluster193 129.88.96.193 -icluster194 129.88.96.194 -icluster195 129.88.96.195 -icluster196 129.88.96.196 -icluster197 129.88.96.197 -icluster198 129.88.96.198 -icluster199 129.88.96.199 -icluster200 129.88.96.200 -icluster201 129.88.96.201 -icluster202 129.88.96.202 -icluster203 129.88.96.203 -icluster204 129.88.96.204 -icluster205 129.88.96.205 -icluster206 129.88.96.206 -icluster207 129.88.96.207 -icluster208 129.88.96.208 -icluster209 129.88.96.209 -icluster210 129.88.96.210 -icluster211 129.88.96.211 -icluster212 129.88.96.212 -icluster213 129.88.96.213 -icluster214 129.88.96.214 -icluster215 129.88.96.215 -icluster216 129.88.96.216 -icluster217 129.88.96.217 -icluster218 129.88.96.218 -icluster219 129.88.96.219 -icluster220 129.88.96.220 -icluster221 129.88.96.221 -icluster222 129.88.96.222 -icluster223 129.88.96.223 -icluster224 129.88.96.224 -icluster225 129.88.96.225 diff --git a/rescue/tree/ka/install.sh b/rescue/tree/ka/install.sh deleted file mode 100755 index ee93c1e19..000000000 --- a/rescue/tree/ka/install.sh +++ /dev/null @@ -1,641 +0,0 @@ -#!/bin/bash - -# this script is run by at startup on the nfs_root system, and runs the ka-deploy client -# it also updates the 'step file' on the tftp server - -# $Revision$ -# $Author$ -# $Date$ -# $Header$ -# $Id$ -# $Log$ -# Revision 1.4 2005/08/28 21:38:32 oblin -# ka support (initially from Antoine Ginies and Erwan Velu) -# -# Revision 1.1.2.5 2003/06/17 06:34:33 erwan -# Removing remaining dchp cache for KA -# -# Revision 1.1.2.4 2003/06/11 18:04:28 erwan -# Fixing mkreiserfs call -# -# Revision 1.1.2.3 2002/11/07 15:10:52 erwan -# SCSI support now activated -# -# Revision 1.1.2.2 2002/11/05 15:49:13 erwan -# added some files -# -# Revision 1.1.2.1 2002/11/05 11:16:54 erwan -# added ka tools in rescue -# -# Revision 1.6 2001/12/03 16:28:02 sderr -# Completely new install script -# -# Revision 1.5 2001/10/10 13:55:04 sderr -# Updates in documentation -# -# Revision 1.4 2001/06/29 09:31:45 sderr -# *** empty log message *** -# -# Revision 1.3 2001/05/31 08:51:43 sderr -# scripts/doc update to match new command-line syntax -# -# Revision 1.2 2001/05/03 12:34:41 sderr -# Added CVS Keywords to most files. Mostly useless. -# -# $State$ - -# This script is provided as an exmaple and should probably not be run as is - - -unset LANG -unset LANGUAGE - -# needed for some for i in foo* loops -shopt -s nullglob - -bash < /dev/tty2 >/dev/tty2 2>&1 & - -# IDEA : maybe this option could be overriden by a kaopt= in the kernel command line ? -KA_SESSION_BASE="-s kainstall" - -ka_call_num=0 - -inc_ka_session() -{ - (( ka_call_num++ )) - cur_ka_session=$KA_SESSION_BASE$ka_call_num -} - - -# testing ? -- NOT FULLY IMPLEMENTED !!!!!!!!!!!!!!!!!!!! -#DONTWRITE=yes -DONTWRITE=no - -# Let's find out what our IP is -ip=`/sbin/ifconfig | grep -v 127.0.0.1 | grep "inet addr" | sed 's/^.*inet addr:\([^ ]*\) .*$/\1/g' | head -n 1` - -# the file tftpserver should contain the name of the .. tftpserver -server=`cat tftpserver` - - -# reverse a file -tac() -{ - awk '{ x[NR] = $0 } END { for (i = NR; i >= 1; i--) print x[i] }' -} - -# run a command, hide its output and print OK if it suceeds, print FAILED and show the output otherwise. -runcom() -{ - echo -n "$1..." 1>&2 - shift; - out=`"$@" 2>&1` - ret=$? - if [ $ret -eq 0 ]; then - echo $C_S"OK"$C_N 1>&2 - else - echo $C_F"Failed"$C_N 1>&2 - echo $C_W"$out"$C_N 1>&2 - fi - return $ret - -} - -# 5 4 3 2 1 zero ignition -countdown() -{ - t=$1 - while [ "$t" -ne 0 ]; do - echo -n "$t " - sleep 1 - # move the cursor back - # I use now tr instead of sed because busybox's sed adds a non-wanted carriage return - # busybox's tr does not seem to know about the [: :] stuff (?) - echo -n "$t " | tr " 0-9" $'\x08' - (( t-- )) - done - # backspace only moves the cursor back, so at this point there's still a "1" to erase - if [ "$1" -ne 0 ] ;then - echo -n " "$'\x08\x08' - fi -} - - -int_shell() -{ - echo $C_H"starting an interactive shell"$C_N - exec /bin/bash -} - -fail() -{ - echo $* - echo $C_F"--- The installation program FAILED ---"$C_N - echo "Check your configuration -- try to read previous error messages" - echo "This machine is going to reboot (Ctrl-S to block it) (Ctrl-C for an interactive shell)" - trap int_shell SIGINT - countdown 30 - do_reboot -} - -do_reboot() -{ - reboot - sleep 1234567 # do not continue the install script (/sbin/reboot does not block) -} - - - -# ahem this LILO function should be fixed someday -# right now this function assumes there is a properly configured lilo on the duplicated linux system -do_lilo() -{ - - -chroot /mnt/disk << EOF -lilo -EOF - - -} - - -run_chroot_command() -{ - - /usr/sbin/chroot /mnt/disk $* - -} - - -log() -{ - echo $* 1>&2 - echo $* >> /tmp/ginstlog -} - -# version for the standard tftp client -std_tftp_put_file() -{ - remotef=$2 - localf=$1 - err=`echo put $localf $remotef | tftp $server 2>&1` - err=`echo $err | grep Sent` - if [ -z "$err" ]; then - log tftp error: could not get/put file - return 1 - fi - return 0 -} - -# version for the tftp client built in busybox -busybox_tftp_put_file() -{ - remotef=$2 - localf=$1 - err=`tftp -p -l $localf -r $remotef $server 2>&1` - if [ $? -ne 0 ]; then - log tftp error: could not get/put file $err - return 1 - fi - return 0 -} - - -busybox_tftp_get_file() -{ - remotef=$1 - localf=$2 - err=`tftp -g -l $localf -r $remotef $server 2>&1` - if [ $? -ne 0 ]; then - log tftp error: could not get/put file $err - return 1 - fi - return 0 -} - - -std_tftp_get_file() -{ - remotef=$1 - localf=$2 - err=`echo get $remotef $localf | tftp $server 2>&1` - err=`echo $err | grep Received` - if [ -z "$err" ]; then - echo tftp error: could not get/put file - return 1 - fi - return 0 -} - -tftp_get_file() -{ - busybox_tftp_get_file "$@" -} - -tftp_put_file() -{ - busybox_tftp_put_file "$@" -} - -# write a string ($2) in a remote file ($1) -tftp_put_in() -{ - echo "$2" > $temp - err=`echo put $temp "$1" | tftp $server 2>&1` - rm -f $temp - err=`echo $err | grep Sent` - if [ -z "$err" ]; then - log tftp error: could not get/put file - return 1 - fi - return 0 -} - -get_var_bis() -{ - while read a; do - echo "$a" | grep -s -q "^ *#.*" - if [ $? -eq 0 ]; then - continue - fi - val=`echo "$a" | sed 's/[^"]*"\(.*[^\\]\)".*/\1/'` - var=`echo "$a" | sed 's/[^"]*".*[^\\]" *\$\([^ ]*\)/\1/'` - if [ "$var" = "$1" ]; then - echo $val - return 0 - fi - done - return 1 -} - -# fetch variable $2 from file $1 -get_var() -{ - (cat $1; echo) | get_var_bis $2 -} - -# find the current step in the kernel command line -get_step() -{ - step=install -# step=`cat /proc/cmdline | sed 's/.*kastep=\([^ ]*\).*/\1/'` - if [ "$step" ]; then - echo $step > /tmp/step - return 0 - fi - return 1 -} - - -# write a new file on the tftp server -# this file is a pxelinux config file -# do this by getting the 'template file' and adding a DEFAULT at the beginning -set_step() -{ - step=$1 - - - runcom "Getting template file" tftp_get_file "ka/pxelinux.cfg/template" /tmp/template || return 1 - - echo DEFAULT $step > /tmp/newcfg - cat /tmp/template >> /tmp/newcfg - - runcom "Sending back new pxelinux config file" tftp_put_file /tmp/newcfg "ka/pxelinux.cfg/IP/$ip" || return 1 - - return 0 -} - - - -# the mount_partition calls must be done in the same shell (NOT a subshell) because the global variable below has to be updated -# idea : maybe use a file instead of this variable (and since the tac function now exists, why not ?) -mounted_fs="" - -# mount a partition UNDER /disk !!! (/disk is prepended to $2) -mount_partition() -{ - dev=$1 - point=$2 - - echo -n "Mounting $C_H$1$C_N as /mnt/disk$C_H$point$C_N" - mkdir -p /mnt/disk$point - test -d /mnt/disk$point || return 1 - runcom "..." mount $dev /mnt/disk/$point || return 1 - mounted_fs="$dev $mounted_fs" - return 0 -} - -# umount all mounted partitions under /disk, in the reverse order -umount_partitions() -{ - for dev in $mounted_fs; do - retries=0 - while ! runcom "Umounting $dev" umount $dev ; do - sleep 3 - (( retries++ )) - if [ $retries -gt 3 ]; then - echo Failed too many times. giving up. - break - fi - done - done -} - - -# recreate excluded directories -# read stdin like this : u=rwx g=rwx o=rwx uid gid filename -recreate_dirs() -{ - while read line; do - declare -a fields - fields=( $line ) - file=/mnt/disk/${fields[5]} -# echo $file -# note : it is possible that the directory exists already, if it was a mount point -# we need to set the permissions/users anyway - mkdir -p $file -# echo chmod ${fields[0]},${fields[1]},${fields[2]} $file - chmod ${fields[0]},${fields[1]},${fields[2]} $file - # argl !! chmod o+t does not work with busybox's chmod ! - # we have to handle it alone - if echo ${fields[2]} | grep -q t; then - chmod +t $file - fi - chown ${fields[3]}.${fields[4]} $file - done -} - -make_partitions() -{ - # we must be in the partfiles directory - for file in partition_tab*; do - drive=`echo $file | sed 's/partition_tab//'` - cat $file | runcom "Writing partition table for $drive using sfdisk" /sbin/sfdisk /dev/$drive -uS --force || fail "error with sfdisk" - done - - for file in fdisk_commands*; do - drive=`echo $file | sed 's/fdisk_commands//'` - runcom "Cleaning hard drive" dd if=/dev/zero of=/dev/$drive bs=1M count=5 || fail "Can t clean drive$drive" - cat $file | runcom "Writing partition table for $drive using fdisk" fdisk /dev/$drive || fail "error with fdisk" - done - -} -checkDevEntries() -{ - if ! test -r /mnt/disk/dev/hda ; then - (cd /dev && tar c *) | (cd /mnt/disk/dev && tar x) - fi -} - -write_MBRs() -{ -# we must be in the partfiles directory also - for file in MBR*; do - drive=`echo $file | sed 's/MBR//'` - runcom "Writing new MBR for $drive" dd if=$file of=/dev/$drive bs=1 count=446 - done -} - - -# Colors -# Success -C_S=$'\033[1;32m' -# Failure -C_F=$'\033[1;31m' -# Warning -C_W=$'\033[1;33m' -# Normal -C_N=$'\033[0;39m' -# Hilight -C_H=$'\033[1;39m' - - -# Clear screen, fancy startup message. -echo $'\033'[2J$'\033'[H -echo "------| $C_H"Ka"$C_N |---- Install starting..." - -temp=/tmp/ginst - -# activate dma ? -- obsolete stuff I think -# runcom "Setting HD optimizations" hdparm -c1 -d1 -K1 $HD - -delay=0 - -if ! runcom "Getting step name" get_step; then - echo "Error: Could not get current step " - fail -else - step=`cat /tmp/step` -fi - -echo Next Server is `cat /ka/tftpserver` - -echo Current step for $ip is : \"$C_H$step$C_N\" - -echo -n "Finding install type : " -case $step in - shell) - echo No install, but interactive shell - ## drop the user to an interactive shell - exec /bin/bash - ;; - install) - install_type=install - nextstep=ready - echo Install Linux - ;; - test_install) - install_type=test_install - nextstep=ready - echo TEST TEST TEST - countdown 10 - echo Install Linux TEST - ;; -esac - - -if [ -z "$install_type" ]; then - echo FATAL : Could not recognize this step name - echo "Aborting... " - fail -fi - - - -# receive the partition table, fstab, etc from the source node -mkdir /tmp/partfiles -inc_ka_session -echo Current session is $cur_ka_session -runcom "Receiving partitions information" /ka/ka-d-client -w $cur_ka_session -e "( cd /tmp/partfiles && tar xvf - )" || fail - - - - -cd /tmp/partfiles -make_partitions - - -test -f /tmp/partfiles/streams || fail "Missing streams file" -first_stream=`cat /tmp/partfiles/streams | head -n 1` - -if [ "$first_stream" = linux ]; then - rcv_linux=yes -else - rcv_linux=no -fi - - - -#if we must receive a linux system, we need to format and mount the partitions -if [ $rcv_linux = yes ]; then - # format partitions - format_partitions() - { - while read line; do - declare -a fields - fields=( $line ) - - case ${fields[2]} in - reiserfs ) - runcom "Formatting ${fields[0]} as reiserfs" mkreiserfs -f ${fields[0]} || fail - ;; - jfs ) - runcom "Formatting ${fields[0]} as jfs" mkfs.jfs ${fields[0]} || fail - ;; - - xfs ) - runcom "Formatting ${fields[0]} as xfs" mkfs.xfs -f ${fields[0]} || fail - ;; - ext3 ) - runcom "Formatting ${fields[0]} as ext3" mkfs.ext2 -j ${fields[0]} || fail - ;; - ext2 ) - runcom "Formatting ${fields[0]} as ext2" mkfs.ext2 ${fields[0]} || fail - ;; - swap ) - runcom "Formatting ${fields[0]} as swap" mkswap ${fields[0]} || fail - ;; - esac - done - } - - format_partitions < /tmp/partfiles/pfstab - - - # mount the partitions - - mount_partitions() - { - while read line; do - declare -a fields - fields=( $line ) - - case ${fields[2]} in - reiserfs ) - mount_partition ${fields[0]} ${fields[1]} || fail - ;; - xfs ) - mount_partition ${fields[0]} ${fields[1]} || fail - ;; - jfs ) - mount_partition ${fields[0]} ${fields[1]} || fail - ;; - ext3 ) - mount_partition ${fields[0]} ${fields[1]} || fail - ;; - ext2 ) - mount_partition ${fields[0]} ${fields[1]} || fail - ;; - esac - done - } - - # NOTE - # I replaced cat truc | mount_partitions by mount_partitions < truc - # because in the former case mount_partitions runs in a subshell and the $mounted_fs value is lost - mount_partitions < /tmp/partfiles/pfstab - - echo ++++++++++++++++++++++++++ - mount - echo ++++++++++++++++++++++++++ - - delay=0 -else - delay=10 -fi - -if [ $DONTWRITE != yes ]; then - for stream in `cat /tmp/partfiles/streams`; do - if [ "$stream" = "linux" ]; then - # partitions already formatted/mounted, just copy now - # untar data from the master 'on the fly' - echo -n "Linux copy is about to start " - countdown $delay - echo - inc_ka_session - /ka/ka-d-client -w $cur_ka_session -e "(cd /mnt/disk; tar --extract --read-full-records --same-permissions --numeric-owner --sparse --file - ) 2>/dev/null" || fail - - runcom "Syncing disks" sync - echo Linux copy done. - echo Creating excluded directories - cat /tmp/partfiles/excluded | recreate_dirs - #echo Setting up networking - #/ka/setup_network.sh - #delay=10 - else - # maybe receive some raw partition dumps - echo Raw copy of $stream is about to start - countdown $delay - inc_ka_session - /ka/ka-d-client -w $cur_ka_session -e "dd of=$stream bs=65536" || fail - delay=10 - fi - done - - echo "Removing computing interfaces" - rm -f /mnt/disk/etc/sysconfig/network-scripts/ifcfg-eth1 >/dev/null 2>&1 - - echo "Removing duplicated dhcp cache" - rm -f /mnt/disk/etc/dhcpc/* >/dev/null 2>&1 - - echo "Writing modules.conf" - /usr/bin/perl /ka/gen_modules_conf.pl >/mnt/disk/etc/modules.conf - - echo "Writing modprobe.conf" - chroot /mnt/disk/ /sbin/generate-modprobe.conf >/mnt/disk/etc/modprobe.conf - - echo "Running mkinitrd" - /ka/make_initrd - - cd /tmp/partfiles - write_MBRs - - - if test -f /tmp/partfiles/command; then - checkDevEntries - command_to_run=`cat /tmp/partfiles/command` - runcom "Running $command_to_run" run_chroot_command "$command_to_run" - fi - -else - echo " I would run ka-deploy(s) and then lilo/mbr " - sleep 1 -fi - -# maybe there is a last dummy ka-deploy for synchronization -if test -f /tmp/partfiles/delay; then - sleep 1 - inc_ka_session - runcom "Waiting source node signal to end installation" /ka/ka-d-client -w $cur_ka_session -e "cat" || fail -fi - -umount_partitions - - -# Update the step file on the tftp server -#runcom 'Sending back new $step' set_step $nextstep || fail - -echo -n Rebooting... -countdown 3 -do_reboot diff --git a/rescue/tree/ka/ka-d-client b/rescue/tree/ka/ka-d-client Binary files differdeleted file mode 100755 index 1ae4fa703..000000000 --- a/rescue/tree/ka/ka-d-client +++ /dev/null diff --git a/rescue/tree/ka/make_initrd b/rescue/tree/ka/make_initrd deleted file mode 100755 index 8f8a0492d..000000000 --- a/rescue/tree/ka/make_initrd +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -echo Looking for default kernel -CHROOT=/mnt/disk -IMG=`cat $CHROOT/etc/lilo.conf | grep default | cut -d "=" -f 2 | sed -e 's/\"//g'` -KERN="x" -INITRD="" -LABEL="x" - -modprobe loop - -for i in `cat $CHROOT/etc/lilo.conf`; do - - if echo $i | grep image >/dev/null; then - KERN=$CHROOT`echo $i | cut -d "=" -f 2` - INITRD="" - LABEL="x" - fi - if echo $i | grep label >/dev/null; then - LABEL=`echo $i | cut -d "=" -f 2 | sed -e 's/\"//g'` - fi - if echo $i | grep initrd >/dev/null; then - INITRD=`echo $i | cut -d "=" -f 2` - fi - if [ ${LABEL} == ${IMG} ] && [ ! -z ${INITRD} ]; then - echo "Kernel name is $KERN" - echo "Initrd name is $INITRD" - KERN_VERSION=`/usr/bin/strings $KERN | grep "^2\.[2.6]"| cut -d " " -f 1` - if [ -z $KERN_VERSION ]; then - echo "No kernel version found !" - fi - chroot $CHROOT mount /proc - mount /dev/ $CHROOT/dev -o bind -# chroot $CHROOT MAKEDEV loop -# chroot $CHROOT MAKEDEV fd -# chroot $CHROOT MAKEDEV hd -# chroot $CHROOT MAKEDEV sd -# chroot $CHROOT MAKEDEV md -# chroot $CHROOT MAKEDEV zero - chroot $CHROOT /sbin/mkinitrd -f $INITRD $KERN_VERSION - umount $CHROOT/dev - chroot $CHROOT umount /proc - exit - fi -done diff --git a/rescue/tree/ka/setup_network.sh b/rescue/tree/ka/setup_network.sh deleted file mode 100755 index 9ef6992bd..000000000 --- a/rescue/tree/ka/setup_network.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# this script setups the network on the cloned system -# puts a correct hostname -# changes the IP if static -- for only ONE device (dunno what will happen with multiple NICs) -# needs the file /ka/hostnames - - -curdir=`pwd` - - -ip=`/sbin/ifconfig | /bin/grep -v 127.0.0.1 | /bin/grep "inet addr" | /bin/sed 's/^.*inet addr:\([^ ]*\) .*$/\1/g'` -oldip=$ip -ip=`echo $ip | sed -e 's/\./_/g'` -echo -n "Setting hostname: " -/bin/hostname $ip - - -# current hostname has been set up in rc.sysinit -ip=$oldip -echo My IP is $ip -cd /ka - -# the sed command will remove unwanted spaces -########################## -# HOSTNMAE already set on NODE -############################ -#if test -f hostnames ; then -# myname=`/bin/cat hostnames | /bin/sed -e 's/ / /g' -e 's/ *$//' | /bin/grep " $ip\$" | /bin/cut -d ' ' -f 1` -# nbfound=`echo "$myname" |/usr/bin/wc -l` -#fi## -# -#if [ $nbfound -ne 1 ] || [ -z "$myname" ]; then -# # try DNS -# echo IP not found in /ka/hostnames, Trying DNS -# myname=`/usr/bin/host $ip | /bin/grep "domain name" | /bin/cut -d " " -f 5 | /bin/sed 's/\.$//g' ` -# myname=`nslookup $ip | grep ^Name: | tail -n +2 | head -n 1 | sed 's/Name: *//'` -#fi -# -#if [ -z "$myname" ]; then -# myname=`/bin/hostname` -# echo WARNING:HOSTNAME NOT FOUND -#fi -# -#echo My hostname is $myname - -# change hostname in the network file -#old=/mnt/disk/etc/sysconfig/network.beforeka -#new=/mnt/disk/etc/sysconfig/network - -#rm -f "$old" -#mv "$new" "$old" -#/bin/cat "$old" | /bin/grep -v ^HOSTNAME= > "$new" -#echo "HOSTNAME=$myname" >> "$new" -###################### -## -###################### - - - - -# assume first NIC is the gatewaydev (right ? wrong ?) -#firstnic=`grep ^GATEWAYDEV "$new" | cut -d = -f 2 | tr -d \"` -#echo GATEWAYDEV=$firstnic - -# see if IP has to be written -#proto=`grep ^BOOTPROTO /mnt/disk/etc/sysconfig/network-scripts/ifcfg-$firstnic | cut -d = -f 2 | tr -d \"` -#echo PROTO=$proto -#if [ "$proto" != "dhcp" ]; then -# # proto is static, write the new IP in the config file -# old=/mnt/disk/etc/sysconfig/network-scripts/ifcfg-$firstnic.beforeka -# new=/mnt/disk/etc/sysconfig/network-scripts/ifcfg-$firstnic -# -# rm -f "$old" -# mv "$new" "$old" -# cat "$old" | grep -v ^IPADDR= > "$new" -# echo IPADDR=$ip >> "$new" -#fi - -cd $curdir diff --git a/rescue/tree/ka/tftpserver b/rescue/tree/ka/tftpserver deleted file mode 100644 index deed6748f..000000000 --- a/rescue/tree/ka/tftpserver +++ /dev/null @@ -1 +0,0 @@ -192.168.200.10 diff --git a/rescue/tree/sbin/fakeshutdown b/rescue/tree/sbin/fakeshutdown deleted file mode 100755 index 3511020ff..000000000 --- a/rescue/tree/sbin/fakeshutdown +++ /dev/null @@ -1,39 +0,0 @@ -#!/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 = <F>; 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 deleted file mode 100755 index 774101d7c..000000000 --- a/rescue/tree/sbin/modprobe +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/perl - -sub cat_ { local *F; open F, $_[0] or $_[1] ? die "cat of file $_[0] failed: $!\n" : return; my @l = <F>; wantarray ? @l : join '', @l } - -sub read_already_loaded() { - foreach (cat_("/proc/modules")) { - my ($name) = split; - $conf{$name}{loaded} = 1; - } -} - -sub load_deps($) { - my ($file) = @_; - - local *F; - open F, $file or log::l("error opening $file: $!"), return 0; - foreach (<F>) { - my ($f, $deps) = split ':'; - push @{$deps{$f}}, split ' ', $deps; - } -} - -my $module_extension = cat_('/proc/version') =~ /^Linux version 2.4/ ? '.o' : '.ko'; - -my %mappings = ("usb-ohci" => "ohci-hcd", - "usb-uhci" => "uhci-hcd", - "uhci" => "uhci-hcd", - "printer" => "usblp", - "bcm4400" => "b44", - "3c559" => "3c359", - "3c90x" => "3c59x", - "dc395x_trm" => "dc395x", - "audigy" => "snd-emu10k1"); - -sub load { - my ($name, @options) = @_; - $name =~ s/\.k?o$//; - - $name = $mappings{$name} || $name; #- 2.4 -> 2.6 compat mappings - - $conf{$name}{loaded} and return; - eval { load($_, 'prereq') } foreach @{$deps{$name}}; - - system("packdrake -x /modules/modules.cz* /tmp $name$module_extension"); - -r "/tmp/$name$module_extension" or die "can't find module $name\n"; - system("/sbin/insmod /tmp/$name$module_extension"); - my $retval = $?; - system("rm /tmp/$name$module_extension"); - $retval and die("insmod $name failed"); -} - -!@ARGV || $ARGV[0] =~ /-h/ and die "usage: modprobe <module> [<options...>]\n"; - -read_already_loaded(); -load_deps("/modules/modules.dep"); -load(@ARGV); diff --git a/rescue/tree/bin/login b/rescue/tree/usr/bin/login index 4b2816926..4b2816926 100755 --- a/rescue/tree/bin/login +++ b/rescue/tree/usr/bin/login diff --git a/rescue/tree/usr/bin/mageia-rescue b/rescue/tree/usr/bin/mageia-rescue new file mode 100755 index 000000000..7d8bb5135 --- /dev/null +++ b/rescue/tree/usr/bin/mageia-rescue @@ -0,0 +1,42 @@ +#!/bin/sh + +# Uncomment for debugging: +# set -x + +systemctl start systemd-udevd +udevadm trigger --type=subsystems --action=add +udevadm trigger --type=devices --action=add + +# 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` + +LOOP="" +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 expert /proc/cmdline; then + rescue-gui && LOOP=y +fi + +while [ "$LOOP" ]; do + bash --login + rescue-gui +done diff --git a/rescue/tree/usr/lib/CVS. b/rescue/tree/usr/lib/CVS. deleted file mode 100644 index e69de29bb..000000000 --- a/rescue/tree/usr/lib/CVS. +++ /dev/null diff --git a/rescue/tree/usr/lib/modules-load.d/mageia-rescue.conf b/rescue/tree/usr/lib/modules-load.d/mageia-rescue.conf new file mode 100644 index 000000000..9d9850baf --- /dev/null +++ b/rescue/tree/usr/lib/modules-load.d/mageia-rescue.conf @@ -0,0 +1,8 @@ +ide-gd_mod +ide-cd_mod +floppy +af_packet +loop +fuse +sd_mod +sr_mod diff --git a/rescue/tree/usr/lib/restore-image-lib.sh b/rescue/tree/usr/lib/restore-image-lib.sh new file mode 100755 index 000000000..3451f7be5 --- /dev/null +++ b/rescue/tree/usr/lib/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/tree/usr/lib/systemd/system/rescue.service b/rescue/tree/usr/lib/systemd/system/rescue.service new file mode 100644 index 000000000..336e06c22 --- /dev/null +++ b/rescue/tree/usr/lib/systemd/system/rescue.service @@ -0,0 +1,20 @@ +[Unit] +Description=Mageia Rescue +DefaultDependencies=no +Conflicts=shutdown.target +After=sysinit.target plymouth-start.service +Before=shutdown.target + +[Service] +Environment=HOME=/ +WorkingDirectory=/ +ExecStartPre=-/bin/plymouth quit +ExecStart=/usr/bin/mageia-rescue +ExecStopPost=-/usr/bin/systemctl --fail --no-block reboot +Type=idle +StandardInput=tty-force +StandardOutput=inherit +StandardError=inherit +KillMode=process +IgnoreSIGPIPE=no +SendSIGHUP=yes diff --git a/rescue/tree/usr/lib/systemd/system/systemd-udevd.service.d/dracut-rules.conf b/rescue/tree/usr/lib/systemd/system/systemd-udevd.service.d/dracut-rules.conf new file mode 100644 index 000000000..b75df2e4e --- /dev/null +++ b/rescue/tree/usr/lib/systemd/system/systemd-udevd.service.d/dracut-rules.conf @@ -0,0 +1 @@ +ExecStartPre=-/usr/bin/rm -f /etc/udev/rules.d/10-console.rules diff --git a/rescue/tree/usr/sbin/diskdrake-resize b/rescue/tree/usr/sbin/diskdrake-resize new file mode 100755 index 000000000..88372aac7 --- /dev/null +++ b/rescue/tree/usr/sbin/diskdrake-resize @@ -0,0 +1,29 @@ +#!/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 <device> <fs type> <size>\n"; + +my %fs_pkgs = ( + vfat => 'resize_fat::main', + ntfs => 'diskdrake::resize_ntfs', + ext2 => 'diskdrake::resize_ext2', + ext3 => 'diskdrake::resize_ext2', + ext4 => '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/tree/usr/sbin/genpasswd b/rescue/tree/usr/sbin/genpasswd new file mode 100755 index 000000000..2f129673d --- /dev/null +++ b/rescue/tree/usr/sbin/genpasswd @@ -0,0 +1,13 @@ +#!/usr/bin/perl + +use strict; + +system "stty -echo"; +print STDERR "Give a password for ssh access: "; +chomp(my $word = <STDIN>); +print STDERR "\n"; +system "stty echo"; + +my @salt = ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]; +print crypt($word, join('', @salt)); +print "\n"; diff --git a/rescue/tree/usr/sbin/grabjournallogs b/rescue/tree/usr/sbin/grabjournallogs new file mode 100755 index 000000000..ef2ea4a1d --- /dev/null +++ b/rescue/tree/usr/sbin/grabjournallogs @@ -0,0 +1,51 @@ +#!/bin/bash + +if ! mountpoint -q /mnt ; then + echo "I do not seem to see a Mageia install mounted on /mnt. You need to mount it first!" >&2 + exit 1 +fi + +if [ ! -f /mnt/etc/machine-id ]; then + echo "Cannot find machine-id file (/mnt/etc/machine-id)" >&2 + exit 1 +fi + +MID=$(cat /mnt/etc/machine-id) +echo +echo "Found machine-id: $MID" +if [ ! -d /mnt/var/log/journal/$MID ]; then + echo "Cannot find journal log directory (/mnt/var/log/journal/<machine-id>)" >&2 + exit 1 +fi + +TIMEFRAME=24 +if [ -n "$1" ]; then + NEWTIMEFRAME=$(( 0 + $1 )) + if [ $NEWTIMEFRAME -gt 0 ]; then + TIMEFRAME=$NEWTIMEFRAME + fi +fi +SINCE="$(LC_ALL=c date --date=$TIMEFRAME' hours ago' +'%F %T')" +echo "Will collect logs from the last $TIMEFRAME hour(s)" +echo " NB give numeric argument to override capture period" + +TEMPFILE=$(mktemp /tmp/grabjournallogs.XXXXXX) +echo -n "Extracting logs... " +journalctl -D /mnt/var/log/journal/$MID --since "$SINCE" -o short >$TEMPFILE +echo "done" + +if [ $(cat $TEMPFILE | wc -l) -lt 2 ]; then + rm -f $TEMPFILE + echo >&2 + echo "Cannot find any logs. Consider increasing the capture period by passing a" >&2 + echo "numeric argument larger than $TIMEFRAME." >&2 + exit 1 +fi + +echo -n "Compressing logs... " +cat $TEMPFILE | xz >/journallogs.xz +rm -f $TEMPFILE +echo "done" + +echo +echo "Your logs have been extracted to the file 'journallogs.xz'" diff --git a/rescue/tree/usr/sbin/restore-image.sh b/rescue/tree/usr/sbin/restore-image.sh new file mode 100755 index 000000000..f4f904f3f --- /dev/null +++ b/rescue/tree/usr/sbin/restore-image.sh @@ -0,0 +1,412 @@ +#!/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 <<EOF +d +n +p +${win32_number} + ++${new_win32_size}K +t +${device_id} +a +${win32_number} +w +EOF + # adds linux partition to the end of the working disk + fdisk /dev/${disk} &>/dev/null <<EOF +n +p +$((${win32_number}+1)) + ++${MIN_DISKSIZE}K +t +$((${win32_number}+1)) +83 +w +EOF +} + +function detect_device() +{ + dialog --backtitle "$BACKTITLE" --title "$TITLE" --infobox "\nTrying to detect your root partition and disk...\n" 4 55 + + root_data=$(detect_root) + if [ -z "${root_data}" ]; then + _msgbox "\nError writing image: disk device not detected.\n" + # so that netbooks using USB sticks as disks can retry (like Gdium) + welcome + root_data=$(detect_root) + fi + set ${root_data} + root=$1 + win32_part_dev=$2 + win32_part_type=$3 + win32_part_new_size=$4 +} + +function write_image() +{ + if [ -n "${win32_part_dev}" ]; then + resize_win32 ${win32_part_dev} ${win32_part_type} ${win32_part_new_size} + fi + + image=$(cat $images_dir/list | cut -d ',' -f 3) + extension=${image/*./} + imagesize=$(ls -l $images_dir/$image | awk '{ print $5 }') + case $extension in + gz) + uncomp=zcat + total=$(gzip -l $images_dir/$image | tail -n 1 | awk '{ print $2 }') + ;; + bz2) + uncomp=bzcat + total=$((imagesize * 3)) + ;; + *) + uncomp=cat + total=$imagesize + ;; + esac + + skipstart=/bin/true + if [ -n "$win32_part_dev" ]; then + skipstart='dd of=/dev/null bs=1 count=32256' + fi + + # the actual dumping command, from image to disk + ${uncomp} ${images_dir}/${image} | (${skipstart} &>/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 <<EOF +device (hd0) /dev/${root%[0-9]} +root (hd0,1) +setup (hd0) +quit +EOF + # change the partition order and boot timeout accordingly + sed -i 's/(hd0,0)/(hd0,1)/g;/^timeout/s/$/0/' ${grub_dir}/menu.lst + + # dualboot configuration for grub + cat >> ${grub_dir}/menu.lst <<EOF +title Microsoft Windows +root (hd0,0) +makeactive +rootnoverify(hd0,0) +chainloader +1 +EOF +} + +function expand_fs() +{ + if [ -z "$win32_part_dev" ]; then + if [ -n "$MAIN_PART_NUMBER" ]; then + part_number=$MAIN_PART_NUMBER + else + part_number=1 + fi + root=${root%[0-9]}$part_number + fi + filesystem_type=$(dumpe2fs -h /dev/${root} 2>/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" + 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/tree/usr/sbin/startssh b/rescue/tree/usr/sbin/startssh new file mode 100755 index 000000000..e14bb10e8 --- /dev/null +++ b/rescue/tree/usr/sbin/startssh @@ -0,0 +1,27 @@ +#!/bin/bash + +# test for an up interface != lo +if test "x"`ifconfig | cut -d ' ' -f 1 | grep -v '^$' | grep -v lo` = "x"; then + echo "There is no up interface, you can try to execute 'drvinst' to find drivers and 'dhcp-client' to configure your interface for DHCP." >&2 + exit 5 +fi + +# generate host keys +mkdir -p /etc/dropbear +[[ -f /etc/dropbear/dropbear_dss_host_key ]] || dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key >/dev/null || { echo "Can't generate dsa host key" >&2 ; exit 4; } +[[ -f /etc/dropbear/dropbear_rsa_host_key ]] || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key >/dev/null || { echo "Can't generate rsa host key" >&2 ; exit 3; } + +# set a password +passwd=`genpasswd` +if (( $? != 0 )); then + reset + exit $? +fi +sed -E -i -e 's/^root:[^:]*:/root:'"${passwd//\//\\/}"':/' /etc/passwd || { echo "Can't set password" >&2 ; exit 2; } + +# test for /dev/pts +grep '^devpts /dev/pts devpts ' /proc/mounts >/dev/null 2>/dev/null || mount -t devpts devpts /dev/pts + +echo "" +echo -n "Starting ssh daemon... " +dropbear -E 2>/var/log/dropbear.log && echo "OK" || { echo "Failed" ; exit 1; } diff --git a/rescue/tree/usr/share/symlinks b/rescue/tree/usr/share/symlinks deleted file mode 100644 index 1c34ff204..000000000 --- a/rescue/tree/usr/share/symlinks +++ /dev/null @@ -1,11 +0,0 @@ -/bin -/boot -/dev -/etc/fstab -/etc/inittab -/etc/rc.sysinit -/lib -/lib64 -/modules -/sbin -/usr |