Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2012-07-12 12:09:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-30 11:34:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2012-07-12 12:09:15.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 11 11:18:30 CEST 2012 - [email protected] + +- add plymouth config option + +------------------------------------------------------------------- Old: ---- linuxrc-4.0.5.tar.bz2 New: ---- linuxrc-4.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.1AyWBC/_old 2012-07-12 12:09:17.000000000 +0200 +++ /var/tmp/diff_new_pack.1AyWBC/_new 2012-07-12 12:09:17.000000000 +0200 @@ -24,9 +24,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.0.5 +Version: 4.0.6 Release: 0 -Source: linuxrc-4.0.5.tar.bz2 +Source: linuxrc-4.0.6.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.0.5.tar.bz2 -> linuxrc-4.0.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.5/VERSION new/linuxrc-4.0.6/VERSION --- old/linuxrc-4.0.5/VERSION 2012-05-30 11:29:40.000000000 +0200 +++ new/linuxrc-4.0.6/VERSION 2012-07-11 15:51:29.000000000 +0200 @@ -1 +1 @@ -4.0.5 +4.0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.5/changelog new/linuxrc-4.0.6/changelog --- old/linuxrc-4.0.5/changelog 2012-05-30 11:29:41.000000000 +0200 +++ new/linuxrc-4.0.6/changelog 2012-07-11 15:51:31.000000000 +0200 @@ -1,4 +1,9 @@ -2012-05-30: HEAD +2012-07-11: sl_12.2-HEAD + - fix console setup after plymouth + - turn off plymouth at first opportunity + - add plymouth config option + +2012-05-30: sl_12.2-4.0.5 - give tmpfs a finite size 2012-04-17: 4.0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.5/file.c new/linuxrc-4.0.6/file.c --- old/linuxrc-4.0.5/file.c 2012-03-26 15:25:13.000000000 +0200 +++ new/linuxrc-4.0.6/file.c 2012-07-11 11:12:27.000000000 +0200 @@ -307,6 +307,7 @@ { key_ptoptions, "PTOptions", kf_cfg + kf_cmd_early }, { key_withfcoe, "WithFCoE", kf_cfg + kf_cmd }, { key_digests, "Digests", kf_cfg + kf_cmd + kf_cmd_early }, + { key_plymouth, "Plymouth", kf_cfg + kf_cmd_early }, }; static struct { @@ -1648,6 +1649,10 @@ slist_free(sl0); break; + case key_plymouth: + if(f->is.numeric) config.plymouth = f->nvalue; + break; + default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.5/file.h new/linuxrc-4.0.6/file.h --- old/linuxrc-4.0.5/file.h 2012-03-26 15:25:13.000000000 +0200 +++ new/linuxrc-4.0.6/file.h 2012-07-11 11:05:45.000000000 +0200 @@ -51,7 +51,8 @@ key_kexec_reboot, key_devbyid, key_braille, key_nfsopts, key_ipv4, key_ipv4only, key_ipv6, key_ipv6only, key_usesax2, key_efi, key_supporturl, key_portno, key_osahwaddr, key_zen, key_zenconfig, key_udevrule, key_dhcpfail, - key_namescheme, key_ptoptions, key_is_ptoption, key_withfcoe, key_digests + key_namescheme, key_ptoptions, key_is_ptoption, key_withfcoe, key_digests, + key_plymouth } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.5/global.h new/linuxrc-4.0.6/global.h --- old/linuxrc-4.0.5/global.h 2012-03-26 15:25:13.000000000 +0200 +++ new/linuxrc-4.0.6/global.h 2012-07-11 11:13:31.000000000 +0200 @@ -357,6 +357,7 @@ unsigned early_bash:1; /* start bash on tty8 */ unsigned early_lsh:1; /* start lsh on tty8 */ unsigned devtmpfs:1; /* mount devtmpfs */ + unsigned plymouth:1; /* start plymouth */ struct { unsigned check:1; /* check for braille displays and start brld if found */ char *dev; /* braille device */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.5/install.c new/linuxrc-4.0.6/install.c --- old/linuxrc-4.0.5/install.c 2012-03-26 15:25:13.000000000 +0200 +++ new/linuxrc-4.0.6/install.c 2012-07-11 15:04:01.000000000 +0200 @@ -1172,6 +1172,11 @@ ); } + // inst_setup turns plymouth off, so don't do it here + if(!(setupcmd && strstr(setupcmd, " inst_setup "))) { + util_plymouth_off(); + } + fprintf(stderr, "starting %s\n", setupcmd); LXRC_WAIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.5/linuxrc.c new/linuxrc-4.0.6/linuxrc.c --- old/linuxrc-4.0.5/linuxrc.c 2012-05-30 11:28:11.000000000 +0200 +++ new/linuxrc-4.0.6/linuxrc.c 2012-07-11 14:16:02.000000000 +0200 @@ -491,6 +491,8 @@ void lxrc_end() { + util_plymouth_off(); + if(config.netstop) { LXRC_WAIT @@ -799,6 +801,8 @@ config.digests.sha1 = config.digests.sha256 = 1; + config.plymouth = 1; + file_do_info(file_get_cmdline(key_lxrcdebug), kf_cmd + kf_cmd_early); LXRC_WAIT @@ -857,6 +861,9 @@ system("cp /lib/udev/80-drivers.rules.no_modprobe /lib/udev/rules.d/80-drivers.rules"); } + config.plymouth &= util_check_exist("/usr/sbin/plymouthd") == 'r' ? 1 : 0; + config.plymouth &= !(config.linemode || config.manual); + if(config.early_bash) { util_start_shell("/dev/tty8", "/bin/bash", 3); } @@ -902,6 +909,8 @@ util_run_script("early_setup"); + if(config.plymouth) util_run_script("plymouth_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.5/util.c new/linuxrc-4.0.6/util.c --- old/linuxrc-4.0.5/util.c 2012-04-16 14:44:47.000000000 +0200 +++ new/linuxrc-4.0.6/util.c 2012-07-11 14:14:49.000000000 +0200 @@ -611,6 +611,7 @@ int i_ii; config.win = 1; + util_plymouth_off(); disp_set_display(); if (config.utf8) printf("\033%%G"); fflush(stdout); @@ -1214,6 +1215,7 @@ add_flag(&sl0, buf, config.digests.sha256, "sha256"); add_flag(&sl0, buf, config.digests.sha512, "sha512"); add_flag(&sl0, buf, config.devtmpfs, "devtmpfs"); + add_flag(&sl0, buf, config.plymouth, "plymouth"); if(*buf) slist_append_str(&sl0, buf); sprintf(buf, "net_config_mask = 0x%x", net_config_mask()); @@ -5035,3 +5037,18 @@ unlink("/tmp/script.result"); } + +void util_plymouth_off() +{ + if(!config.plymouth) return; + + config.plymouth = 0; + + if(util_check_exist("/usr/bin/plymouth") != 'r') return; + + system("/usr/bin/plymouth quit"); + + kbd_init(0); +} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.0.5/util.h new/linuxrc-4.0.6/util.h --- old/linuxrc-4.0.5/util.h 2012-04-16 14:28:45.000000000 +0200 +++ new/linuxrc-4.0.6/util.h 2012-07-11 13:26:12.000000000 +0200 @@ -168,3 +168,5 @@ int fcoe_check(void); void util_run_script(char *name); +void util_plymouth_off(void); + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
