Hello community, here is the log from the commit of package linuxrc checked in at Wed Apr 9 21:34:23 CEST 2008. -------- --- linuxrc/linuxrc.changes 2008-04-07 16:12:30.000000000 +0200 +++ linuxrc/linuxrc.changes 2008-04-09 11:41:46.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 9 11:41:43 CEST 2008 - snwint@suse.de + +- allow 'root: kexec' in /etc/yast.inf + +------------------------------------------------------------------- Old: ---- linuxrc-3.1.15.tar.bz2 New: ---- linuxrc-3.1.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.h18281/_old 2008-04-09 21:30:19.000000000 +0200 +++ /var/tmp/diff_new_pack.h18281/_new 2008-04-09 21:30:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.1.15) +# spec file for package linuxrc (Version 3.1.16) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,9 +17,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.1.15 +Version: 3.1.16 Release: 1 -Source: linuxrc-3.1.15.tar.bz2 +Source: linuxrc-3.1.16.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +54,8 @@ %doc linuxrc.html %changelog +* Wed Apr 09 2008 snwint@suse.de +- allow 'root: kexec' in /etc/yast.inf * Mon Apr 07 2008 snwint@suse.de - added kexec_reboot option (for yast) * Fri Apr 04 2008 snwint@suse.de ++++++ linuxrc-3.1.15.tar.bz2 -> linuxrc-3.1.16.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.15/Changelog new/linuxrc-3.1.16/Changelog --- old/linuxrc-3.1.15/Changelog 2008-04-07 16:02:50.000000000 +0200 +++ new/linuxrc-3.1.16/Changelog 2008-04-09 11:40:01.000000000 +0200 @@ -1,3 +1,6 @@ +9/4/2008: v3.1.16 + - allow 'root: kexec' in /etc/yast.inf + 7/4/2008: v3.1.15 - added kexec_reboot option (for yast) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.15/file.c new/linuxrc-3.1.16/file.c --- old/linuxrc-3.1.15/file.c 2008-04-07 16:02:00.000000000 +0200 +++ new/linuxrc-3.1.16/file.c 2008-04-09 11:34:35.000000000 +0200 @@ -298,6 +298,7 @@ { "Alt" , 3 }, { "Reboot", 1 }, { "Halt", 2 }, + { "kexec", 3 }, { "no scheme", inst_none }, { "file", inst_file }, { "nfs", inst_nfs }, @@ -1012,8 +1013,10 @@ slist_free(config.linuxrc); config.linuxrc = slist_split(',', f->value); if(slist_getentry(config.linuxrc, "nocmdline")) config.info.add_cmdline = 0; +#if 0 /* ###### still needed? */ - if(slist_getentry(config.linuxrc, "reboot")) reboot_ig = 1; + if(slist_getentry(config.linuxrc, "reboot")) config.restart_method = 1; +#endif break; case key_kernel_pcmcia: @@ -1459,7 +1462,7 @@ case key_root: root = 1; if(!f->is.numeric) str_copy(&config.new_root, f->value); - reboot_ig = f->nvalue; + config.restart_method = f->nvalue; break; case key_keytable: @@ -1708,7 +1711,7 @@ file_write_modparms(f); file_write_str(f, key_loghost, config.loghost); - if(reboot_ig) file_write_num(f, key_reboot, reboot_ig); + if(config.restart_method) file_write_num(f, key_reboot, config.restart_method); file_write_num(f, key_keyboard, 1); /* we always have one - what's the point ??? */ file_write_str(f, key_updatedir, config.update.dir); file_write_num(f, key_yast2update, config.update.ask || config.update.count ? 1 : 0); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.15/global.c new/linuxrc-3.1.16/global.c --- old/linuxrc-3.1.15/global.c 2007-08-02 18:00:00.000000000 +0200 +++ new/linuxrc-3.1.16/global.c 2008-04-09 11:33:08.000000000 +0200 @@ -24,7 +24,6 @@ char *kernellog_tg = "/etc/kernellog"; char *lastlog_tg = "/etc/lastlog"; char *bootmsg_tg = "/var/log/boot.msg"; -int reboot_ig; char xkbmodel_tg [20] = ""; unsigned yast2_color_ig = 0; int reboot_wait_ig = FALSE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.15/global.h new/linuxrc-3.1.16/global.h --- old/linuxrc-3.1.15/global.h 2008-04-07 16:04:33.000000000 +0200 +++ new/linuxrc-3.1.16/global.h 2008-04-09 11:33:00.000000000 +0200 @@ -330,6 +330,7 @@ unsigned squash:1; /* convert cpio/rpm to squashfs after download */ unsigned keepinstsysconfig:1; /* don't reload instsys config data */ unsigned withiscsi; /* iSCSI parameter */ + unsigned restart_method; /* 0: start new root fs, 1: reboot, 2: halt, 3: kexec */ char *instsys_id; /* instsys id */ char *initrd_id; /* initrd id */ slist_t *disks; /* list of harddisk, without '/dev/' */ @@ -573,7 +574,6 @@ extern char *kernellog_tg; extern char *lastlog_tg; extern char *bootmsg_tg; -extern int reboot_ig; extern char xkbmodel_tg [20]; extern unsigned yast2_color_ig; extern int reboot_wait_ig; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.15/install.c new/linuxrc-3.1.16/install.c --- old/linuxrc-3.1.15/install.c 2008-04-04 16:23:15.000000000 +0200 +++ new/linuxrc-3.1.16/install.c 2008-04-09 11:39:17.000000000 +0200 @@ -1264,30 +1264,49 @@ */ int inst_commit_install() { - int err = 0; + int err = 1; - if(reboot_ig == 2) { - reboot(RB_POWER_OFF); - } - else if(reboot_ig) { + switch(config.restart_method) { + case 1: /* reboot */ + if(config.rebootmsg){ + disp_clear_screen(); + util_disp_init(); + dia_message(txt_get(TXT_DO_REBOOT), MSGTYPE_INFO); + } - if(config.rebootmsg) { - disp_clear_screen(); - util_disp_init(); - dia_message(txt_get(TXT_DO_REBOOT), MSGTYPE_INFO); - } + if(config.test) { + fprintf(stderr, "*** reboot ***\n"); + break; + } - if(config.test) { - fprintf(stderr, "*** reboot ***\n"); - } - else { -#if defined(__s390__) || defined(__s390x__) +#if defined(__s390__) || defined(__s390x__) reboot(RB_POWER_OFF); #else reboot(RB_AUTOBOOT); #endif - } - err = 1; + break; + + case 2: /* power off */ + if(config.test) { + fprintf(stderr, "*** power off ***\n"); + break; + } + + reboot(RB_POWER_OFF); + break; + + case 3: /* kexec */ + if(config.test) { + fprintf(stderr, "*** kexec ***\n"); + break; + } + + system("kexec -e"); + break; + + default: /* do nothing */ + err = 0; + break; } return err; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.15/VERSION new/linuxrc-3.1.16/VERSION --- old/linuxrc-3.1.15/VERSION 2008-04-07 16:02:17.000000000 +0200 +++ new/linuxrc-3.1.16/VERSION 2008-04-09 11:39:31.000000000 +0200 @@ -1 +1 @@ -3.1.15 +3.1.16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de