diff options
| -rwxr-xr-x | rescue/make_rescue_img | 15 | ||||
| -rwxr-xr-x | rescue/tree/usr/bin/login (renamed from rescue/tree/bin/login) | 0 | ||||
| -rwxr-xr-x | rescue/tree/usr/sbin/fakeshutdown (renamed from rescue/tree/sbin/fakeshutdown) | 0 |
3 files changed, 9 insertions, 6 deletions
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 18c045acb..432a6cf94 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -15,20 +15,23 @@ BEGIN { undef *_ } sub __ { print @_, "\n"; system(@_) } sub _ { __ @_; $? and die } +my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch(); _ "rm -rf $tmp" if -e $tmp; -_ "mkdir $tmp"; +_ "mkdir -p $tmp/usr/{bin,sbin,lib}"; +_ "ln -s usr/bin $tmp/bin"; +_ "ln -s usr/sbin $tmp/sbin"; +_ "ln -s usr/lib $tmp/lib"; +if ($arch eq "x86_64") { + _ "mkdir $tmp/usr/lib64"; + _ "ln -s usr/lib64 $tmp/lib64"; +} _ 'find . -name "*~" | xargs rm -f'; mkdir_p($tmp . chomp_($_)) foreach cat_("dirs"); _ "cp -a tree/* $tmp"; -_ "find $tmp -name .svn | xargs rm -rf"; substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue"; _ "../tools/install-xml-file-list list.xml $tmp"; -# / -> /usr move -_ "mkdir -p $tmp/usr/{,s}bin"; -_ "/usr/lib/dracut/modules.d/30convertfs/convertfs.sh $tmp"; - my %keytable_conflicts; my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1); foreach (keyboard::loadkeys_files(sub { warn @_ })) { 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/sbin/fakeshutdown b/rescue/tree/usr/sbin/fakeshutdown index 309f26c6c..309f26c6c 100755 --- a/rescue/tree/sbin/fakeshutdown +++ b/rescue/tree/usr/sbin/fakeshutdown |