Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2012-04-18 12:34:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2012-04-17 07:46:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2012-04-18 12:34:55.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Apr 17 15:52:20 CEST 2012 - [email protected] + +- adjust rescue system setup +- move prepare_rescue script + +------------------------------------------------------------------- +Mon Apr 16 14:46:59 CEST 2012 - [email protected] + +- add api to run scripts at various places + +------------------------------------------------------------------- Old: ---- linuxrc-4.0.3.tar.bz2 New: ---- linuxrc-4.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.xGuQKp/_old 2012-04-18 12:34:59.000000000 +0200 +++ /var/tmp/diff_new_pack.xGuQKp/_new 2012-04-18 12:34:59.000000000 +0200 @@ -24,9 +24,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.0.3 +Version: 4.0.4 Release: 0 -Source: linuxrc-4.0.3.tar.bz2 +Source: linuxrc-4.0.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.0.3.tar.bz2 -> linuxrc-4.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.3/VERSION new/linuxrc-4.0.4/VERSION --- old/linuxrc-4.0.3/VERSION 2012-04-16 12:12:53.000000000 +0200 +++ new/linuxrc-4.0.4/VERSION 2012-04-17 15:52:16.000000000 +0200 @@ -1 +1 @@ -4.0.3 +4.0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.3/changelog new/linuxrc-4.0.4/changelog --- old/linuxrc-4.0.3/changelog 2012-04-16 12:12:55.000000000 +0200 +++ new/linuxrc-4.0.4/changelog 2012-04-17 15:52:17.000000000 +0200 @@ -1,4 +1,9 @@ -2012-04-16: HEAD +2012-04-17: HEAD + - adjust rescue system setup + - move prepare_rescue script + - add api to run scripts at various places + +2012-04-16: 4.0.3 - create /dev/pts dir - mount /dev/pts after devtmpfs (bnc #755845) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.3/linuxrc.c new/linuxrc-4.0.4/linuxrc.c --- old/linuxrc-4.0.3/linuxrc.c 2012-04-16 11:49:33.000000000 +0200 +++ new/linuxrc-4.0.4/linuxrc.c 2012-04-17 11:18:44.000000000 +0200 @@ -324,7 +324,7 @@ slist_t *sl; char *argv[3] = { }; char *dirs[] = { - "bin", "boot", "etc", "home", "lib", + "bin", "boot", "etc", "home", "lib", "run", "media", "mounts", "mounts/initrd", "mnt", "proc", "sbin", "sys", "tmp", "usr", "usr/lib", "usr/lib/microcode", "var", NULL @@ -371,7 +371,15 @@ // add devices strprintf(&buf, "%s/dev", mp); - rename("/dev", buf); + if(config.devtmpfs) { + umount("/dev/pts"); + umount("/dev"); + mkdir(buf, 0755); + mount("devtmpfs", buf, "devtmpfs", 0, 0); + } + else { + rename("/dev", buf); + } // keep initrd available strprintf(&buf, "%s/mounts/initrd", mp); @@ -406,7 +414,7 @@ chroot("."); if(config.rescue) { - system("/mounts/initrd/bin/prepare_rescue"); + system("/mounts/initrd/scripts/prepare_rescue"); // system("PS1='\\w # ' /bin/bash 2>&1"); @@ -830,7 +838,7 @@ if (config.linemode) putchar('\n'); printf( - "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2011 SUSE Linux Products GmbH <<<\n", + "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2012 SUSE Linux Products GmbH <<<\n", config.product ); if (config.linemode) @@ -892,6 +900,8 @@ } } + util_run_script("early_setup"); + util_free_mem(); if(config.memoryXXX.free < config.memoryXXX.min_free) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.3/util.c new/linuxrc-4.0.4/util.c --- old/linuxrc-4.0.3/util.c 2012-03-26 15:25:13.000000000 +0200 +++ new/linuxrc-4.0.4/util.c 2012-04-16 14:44:47.000000000 +0200 @@ -5015,3 +5015,23 @@ return fcoe_ok; } + +void util_run_script(char *name) +{ + char *buf = NULL; + + if(util_check_exist2("/scripts", name) != 'r') return; + + file_write_install_inf(""); + + strprintf(&buf, "/scripts/%s", name); + + system(buf); + + str_copy(&buf, NULL); + + file_read_info_file("file:/tmp/script.result", kf_cfg); + + unlink("/tmp/script.result"); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.3/util.h new/linuxrc-4.0.4/util.h --- old/linuxrc-4.0.3/util.h 2012-03-26 15:25:14.000000000 +0200 +++ new/linuxrc-4.0.4/util.h 2012-04-16 14:28:45.000000000 +0200 @@ -166,4 +166,5 @@ hd_t *fix_device_names(hd_t *hd); int fcoe_check(void); +void util_run_script(char *name); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
