diff options
| author | Colin Guthrie <colin@mageia.org> | 2012-10-21 19:14:29 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2012-10-21 19:14:29 +0000 |
| commit | f726d6ae6bfad915940f0b8e2bba654c381bb1f7 (patch) | |
| tree | e430885d0e2b9b39061cc3ec766b4c091f6793fa | |
| parent | 78d548fd23361912b7edd0ffa4605f20cc517467 (diff) | |
| download | drakx-backup-do-not-use-f726d6ae6bfad915940f0b8e2bba654c381bb1f7.tar drakx-backup-do-not-use-f726d6ae6bfad915940f0b8e2bba654c381bb1f7.tar.gz drakx-backup-do-not-use-f726d6ae6bfad915940f0b8e2bba654c381bb1f7.tar.bz2 drakx-backup-do-not-use-f726d6ae6bfad915940f0b8e2bba654c381bb1f7.tar.xz drakx-backup-do-not-use-f726d6ae6bfad915940f0b8e2bba654c381bb1f7.zip | |
Layout stage2 filesystem in a post usrmove-esque way (symlinked bin, lib etc)
| -rw-r--r-- | perl-install/install/Makefile | 5 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile index 1756566b0..048e401f4 100644 --- a/perl-install/install/Makefile +++ b/perl-install/install/Makefile @@ -65,10 +65,11 @@ install_pms: get_needed_files: xs # generate installer system: REP4PMS=$(REP4PMS) ../../tools/install-xml-file-list share/list.xml $(DEST) + mkdir -p $(DEST)/usr/sbin + /usr/lib/dracut/modules.d/30convertfs/convertfs.sh $(DEST) chmod u-s -R $(DEST) # for mount/umount share/generate-xlocales $(DEST) - mv -f $(DEST)/usr/$(LIB)/*.so* $(DEST)/$(LIB) ../../tools/simplify-drakx-modules $(DEST)/usr/*/*/*/utf8_heavy.pl perl -I.. -Mlang -e 'symlink "UTF-8", "$(DEST)/usr/share/locale/$$_" foreach lang::list_langs()' @@ -108,8 +109,6 @@ stage2: mkdir -p $(DEST)/usr $(MAKE) get_needed_files $(MAKE) install_pms - # / -> /usr move - for i in bin ; do mv $(DEST)/$$i/* $(DEST)/usr/$$i; rmdir $(DEST)/$$i; ln -s /usr/$$i $(DEST); done dont_run_directly_stage2: [ -d $(DEST) ] || ../../tools/mdkinst_stage2_tool --uncompress $(STAGE2_DEST) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index dcf80a73e..2fe2ea166 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - include FIRMWARE packages from Cards+ in detected graphical drivers, to install radeon-firmware during install (#6438, #7641) +- properly generate stage2 with a usrmove-esque fs layout Version 14.47 - 12 October 2012 |