Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-09-19 13:55:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-09-18 07:12:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-09-19 13:55:57.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Sep 18 09:51:13 CEST 2014 - snw...@suse.de + +- add sshkey option to support ssh pubkey authentication (bnc #230781, bnc #421340) +- 5.0.21 + +------------------------------------------------------------------- +Thu Sep 18 08:12:17 CEST 2014 - snw...@suse.de + +- make ifcfg=dhcp{4,6} work as expected +- 5.0.20 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.19.tar.xz New: ---- linuxrc-5.0.21.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.byQrZL/_old 2014-09-19 13:55:58.000000000 +0200 +++ /var/tmp/diff_new_pack.byQrZL/_new 2014-09-19 13:55:58.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.19 +Version: 5.0.21 Release: 0 -Source: linuxrc-5.0.19.tar.xz +Source: linuxrc-5.0.21.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-5.0.19.tar.xz -> linuxrc-5.0.21.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.19/VERSION new/linuxrc-5.0.21/VERSION --- old/linuxrc-5.0.19/VERSION 2014-09-17 10:19:26.000000000 +0200 +++ new/linuxrc-5.0.21/VERSION 2014-09-18 09:50:58.000000000 +0200 @@ -1 +1 @@ -5.0.19 +5.0.21 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.19/auto2.c new/linuxrc-5.0.21/auto2.c --- old/linuxrc-5.0.19/auto2.c 2014-09-17 10:19:00.000000000 +0200 +++ new/linuxrc-5.0.21/auto2.c 2014-09-18 09:50:06.000000000 +0200 @@ -359,6 +359,24 @@ } /* + * load ssh key + */ + if(config.net.sshkey) { + url = url_set(config.net.sshkey); + fprintf(stderr, "Downloading SSH key: %s\n", config.net.sshkey); + printf("Downloading SSH key: %s\n", config.net.sshkey); + fflush(stdout); + err = url_read_file_anywhere(url, NULL, NULL, "/download/authorized_keys", NULL, URL_FLAG_PROGRESS + URL_FLAG_NODIGEST); + url_umount(url); + url_free(url); + if(!err) { + fprintf(stderr, "activating SSH key\n"); + mkdir("/root/.ssh", 0755); + rename("/download/authorized_keys", "/root/.ssh/authorized_keys"); + } + } + + /* * load autoyast file unless the user has specified an autoyast option * -- ok this sounds weird but actually makes sense... */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.19/changelog new/linuxrc-5.0.21/changelog --- old/linuxrc-5.0.19/changelog 2014-09-17 10:19:29.000000000 +0200 +++ new/linuxrc-5.0.21/changelog 2014-09-18 09:51:10.000000000 +0200 @@ -1,4 +1,14 @@ -2014-09-17: HEAD +2014-09-18: HEAD + - Merge pull request #31 from openSUSE/sw_0018 + - add sshkey option tp support ssh pubkey authentication (bnc #230781, bnc... + - add sshkey option tp support ssh pubkey authentication (bnc #230781, bnc #421340) + +2014-09-18: 5.0.20 + - Merge pull request #30 from openSUSE/sw_0017 + - make ifcfg=dhcp{4,6} work as expected + - make ifcfg=dhcp{4,6} work as expected + +2014-09-17: 5.0.19 - Merge pull request #29 from openSUSE/sw_0016 - Sw 0016 - remove unnecessary check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.19/file.c new/linuxrc-5.0.21/file.c --- old/linuxrc-5.0.19/file.c 2014-08-18 16:24:46.000000000 +0200 +++ new/linuxrc-5.0.21/file.c 2014-09-18 09:50:06.000000000 +0200 @@ -162,6 +162,7 @@ { key_displayip, "Display_IP", kf_cfg + kf_cmd }, { key_sshpassword, "SSHPassword", kf_cfg + kf_cmd }, { key_sshpasswordenc, "SSHPasswordEnc", kf_cfg + kf_cmd }, + { key_sshkey, "SSHKey", kf_cfg + kf_cmd }, { key_term, "TERM", kf_cfg + kf_cmd }, { key_addswap, "AddSwap", kf_cfg + kf_cmd }, { key_aborted, "Aborted", kf_yast }, @@ -880,6 +881,10 @@ str_copy(&config.net.sshpassword_enc, *f->value ? f->value : NULL); break; + case key_sshkey: + str_copy(&config.net.sshkey, *f->value ? f->value : NULL); + break; + case key_term: str_copy(&config.term, *f->value ? f->value : NULL); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.19/file.h new/linuxrc-5.0.21/file.h --- old/linuxrc-5.0.19/file.h 2014-08-18 15:17:24.000000000 +0200 +++ new/linuxrc-5.0.21/file.h 2014-09-18 09:50:06.000000000 +0200 @@ -53,7 +53,8 @@ key_osahwaddr, key_zen, key_zenconfig, key_udevrule, key_dhcpfail, key_namescheme, key_ptoptions, key_is_ptoption, key_withfcoe, key_digests, key_plymouth, key_sslcerts, key_restart, key_restarted, key_autoyast2, - key_withipoib, key_upgrade, key_ifcfg, key_defaultinstall, key_nanny, key_vlanid + key_withipoib, key_upgrade, key_ifcfg, key_defaultinstall, key_nanny, key_vlanid, + key_sshkey } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.19/global.h new/linuxrc-5.0.21/global.h --- old/linuxrc-5.0.19/global.h 2014-08-18 16:24:46.000000000 +0200 +++ new/linuxrc-5.0.21/global.h 2014-09-18 09:50:06.000000000 +0200 @@ -612,6 +612,7 @@ char *displayip; /* name of remote X server */ char *sshpassword; /* inst-sys root password */ char *sshpassword_enc; /* encrypted inst-sys root password */ + char *sshkey; /* url pointing to ssh key */ net_config_t configured; /* how we configured the network device */ char *ethtool_used; /* ethtool options used for active card */ char *dhcpfail; /* dhcp failure action */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.19/net.c new/linuxrc-5.0.21/net.c --- old/linuxrc-5.0.19/net.c 2014-09-12 11:49:50.000000000 +0200 +++ new/linuxrc-5.0.21/net.c 2014-09-18 09:50:06.000000000 +0200 @@ -91,7 +91,7 @@ } } - if(config.usessh && !config.net.sshpassword) { + if(config.usessh && !config.net.sshpassword && !config.net.sshkey) { if(!config.win) util_disp_init(); dia_input2("Enter your temporary SSH password.", &config.net.sshpassword, 20, 1); } @@ -1129,6 +1129,7 @@ int got_ip = 0; ifcfg_t *ifcfg = NULL; char *device = config.ifcfg.manual->device; + char *type; if(config.test) { config.net.dhcp_active = 1; @@ -1136,7 +1137,15 @@ return; } - strprintf(&buf, "Sending DHCP%s request to %s...", net_dhcp_type(), device); + type = net_dhcp_type(); + + // override the default by an explicit ifcfg=dhcp{4,6} + if(!*type && config.ifcfg.manual->type) { + if(!strcmp(config.ifcfg.manual->type, "dhcp4")) type = "4"; + if(!strcmp(config.ifcfg.manual->type, "dhcp6")) type = "6"; + } + + strprintf(&buf, "Sending DHCP%s request to %s...", type, device); fprintf(stderr, "%s\n", buf); if(config.win) { dia_info(&win, buf, MSGTYPE_INFO); @@ -1150,6 +1159,8 @@ ifcfg = calloc(1, sizeof *ifcfg); ifcfg->dhcp = 1; + strprintf(&ifcfg->type, "dhcp%s", type); + ifcfg_write(device, ifcfg, 0); free(ifcfg->type); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org