[yast-commit] r40387 - in /trunk/registration: ./ package/ src/clients/ src/config/ src/modules/

Author: jdsn Date: Tue Aug 21 21:47:20 2007 New Revision: 40387 URL: http://svn.opensuse.org/viewcvs/yast?rev=40387&view=rev Log: handle sysconfig file with fillup code cleanup - non root user not supported Added: trunk/registration/src/config/sysconfig.suse_register-yast2-registration Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/config/Makefile.am trunk/registration/src/modules/Register.ycp trunk/registration/yast2-registration.spec.in Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=40387&r1=40386&r2=40387&view=diff ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Tue Aug 21 21:47:20 2007 @@ -1 +1 @@ -2.15.0 +2.15.1 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=40387&r1=40386&r2=40387&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Tue Aug 21 21:47:20 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 21 21:42:33 CEST 2007 - jdsn@suse.de + +- handling sysconfig file with fillup (#300064) +- code cleanup - nonroot user not supported +- 2.15.1 + +------------------------------------------------------------------- Fri Aug 3 20:13:19 CEST 2007 - jdsn@suse.de - new version Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=40387&r1=40386&r2=40387&view=diff ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Tue Aug 21 21:47:20 2007 @@ -462,31 +462,15 @@ if ( textmode ) { cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/w3m") == 0 ? true:false; - - if ( Register::iamroot ) - bcmd = " w3m "; - else - { - cmd_ok = cmd_ok && (integer) SCR::Execute(.target.bash, "test -x /usr/bin/screen") == 0 ? true:false; - bcmd = " screen w3m "; - } + cmd_ok = cmd_ok && (integer) SCR::Execute(.target.bash, "test -x /usr/bin/screen") == 0 ? true:false; + bcmd = " screen w3m "; } else { - - if ( Register::iamroot ) - { - // check for and install mozilla-xulrunner if needed (#175166) - Package::InstallAllMsg(["mozilla-xulrunner181"], nil); - cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false; - bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url "; - } - else - { // this case will never happen because we will not run as non-root (#170736) - Package::InstallAllMsg(["MozillaFirefox"], nil); // (#175166) - cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/firefox") == 0 ? true:false; - bcmd = " firefox -new-window "; - } + // check for and install mozilla-xulrunner if needed (#175166) + Package::InstallAllMsg(["mozilla-xulrunner181"], nil); + cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false; + bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url "; } if (! cmd_ok) return "nobrowser"; @@ -496,19 +480,13 @@ if (Register::use_proxy) { - // check if proxy setting is correct (#208651) - string proxy_http = Register::http_proxy; - string proxy_https = Register::https_proxy; - if (proxy_http == nil) proxy_http = ""; - if (proxy_https == nil) proxy_https = ""; - // (#165891) - bcmd = " http_proxy='" + proxy_http + "' " + bcmd; - bcmd = " https_proxy='" + proxy_https + "' " + bcmd; + bcmd = " http_proxy='" + Register::http_proxy + "' " + bcmd; + bcmd = " https_proxy='" + Register::https_proxy + "' " + bcmd; } - // in case of root add su call to not run a browser as root during installation - if ( Register::iamroot ) bcmd = su_exec("suse-ncc", "suse-ncc", bcmd ); + // add su call to not run a browser as root during installation + bcmd = su_exec("suse-ncc", "suse-ncc", bcmd ); return bcmd; } Modified: trunk/registration/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/Makefile.am?rev=40387&r1=40386&r2=40387&view=diff ============================================================================== --- trunk/registration/src/config/Makefile.am (original) +++ trunk/registration/src/config/Makefile.am Tue Aug 21 21:47:20 2007 @@ -5,6 +5,8 @@ rncdir = $(schemadir)/autoyast/rnc rnc_DATA = registration.rnc -EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) +fillup_DATA = sysconfig.suse_register-yast2-registration + +EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) $(fillup_DATA) include $(top_srcdir)/Makefile.am.common Added: trunk/registration/src/config/sysconfig.suse_register-yast2-registration URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/sysconfig.suse_register-yast2-registration?rev=40387&view=auto ============================================================================== --- trunk/registration/src/config/sysconfig.suse_register-yast2-registration (added) +++ trunk/registration/src/config/sysconfig.suse_register-yast2-registration Tue Aug 21 21:47:20 2007 @@ -0,0 +1,20 @@ +## Path: System/Yast2/SUSEregister +## Description: Online Update Configuration + +## Type: boolean +## Default: "" +# +# Send optional data during registration +# +# +SUBMIT_OPTIONAL="" + +## Type: boolean +## Default: "" +# +# Send information about used hardware during registration. +# I order to ship needed drivers in future releases you can +# help us improving the distriburtion by sending data about +# your used hardware. +# +SUBMIT_HWDATA="" Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Register.ycp?rev=40387&r1=40386&r2=40387&view=diff ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Tue Aug 21 21:47:20 2007 @@ -61,22 +61,6 @@ // START: Locally defined functions // ------------------------------------------------------------------ -/* - * get_home_dir() - * - * get the home directory of the user running this module - * because not only root is allowed to run inst_suse_register - * - * @return home directory as string - * - */ -string get_home_dir() -{ - map gethome = (map) SCR::Execute(.target.bash_output, " cd; pwd "); - return ((integer) gethome["exit"]:1 == 0) ? String::FirstChunk(gethome["stdout"]:"/tmp", "\n") : "/tmp"; -} - - /* * amIroot() @@ -114,28 +98,17 @@ http_proxy = (string) SCR::Read(.sysconfig.proxy.HTTP_PROXY); https_proxy = (string) SCR::Read(.sysconfig.proxy.HTTPS_PROXY); - // then read from sysconfig - if (FileUtils::Exists("/etc/sysconfig/suse_register")) + // proxy error handling now moved to the correct place (#208651) + if ( ! use_proxy || http_proxy == nil) http_proxy = ""; + if ( ! use_proxy || https_proxy == nil) https_proxy = ""; + + + // then read from sysconfig - but not during installation + if (Mode::normal()) { submit_optional = (string) SCR::Read( .sysconfig.suse_register.SUBMIT_OPTIONAL ) == "true" ? true:false; submit_hwdata = (string) SCR::Read( .sysconfig.suse_register.SUBMIT_HWDATA ) == "true" ? true:false; } - - // and in case of nonroot read from user's home - if (!iamroot) - { - string home_config = sformat("%1/.suse_register", get_home_dir() ); - if (FileUtils::Exists(home_config)) - { - foreach (string line, - splitstring ((string)SCR::Read(.target.string, home_config ),"\n"), { - if ( regexpmatch(line, "^SUBMIT_OPTIONAL=\"[^\"]*\".*$") ) - submit_optional = regexpsub(line, "^SUBMIT_OPTIONAL=\"([^\"]*)\".*$", "\\1") == "true" ? true:false; - else if ( regexpmatch(line, "^SUBMIT_HWDATA=\"[^\"]*\".*$") ) - submit_hwdata = regexpsub(line, "^SUBMIT_HWDATA=\"([^\"]*)\".*$", "\\1") == "true" ? true:false; - }); - } - } } @@ -149,20 +122,8 @@ */ void write_config() { - if (iamroot) - { - // avoid missing file error message in log (#211899) - SCR::Execute(.target.bash, "touch /etc/sysconfig/suse_register"); - SCR::Write(.sysconfig.suse_register.SUBMIT_OPTIONAL, sformat("%1", submit_optional ? true:false )); - SCR::Write(.sysconfig.suse_register.SUBMIT_HWDATA, sformat("%1", submit_hwdata ? true:false )); - } - else - { - string home_config = sformat("%1/.suse_register", get_home_dir() ); - string confdata = sformat("#\n# .suse_register is created and read by YaST\n# it stores the configuration status of the registration module\n#\n\nSUBMIT_OPTIONAL=\"%1\"\nSUBMIT_HWDATA=\"%2\"", submit_optional ? true:false, submit_hwdata ? true:false ); - SCR::Write(.target.string, home_config, confdata); - } - + SCR::Write(.sysconfig.suse_register.SUBMIT_OPTIONAL, sformat("%1", submit_optional ? true:false )); + SCR::Write(.sysconfig.suse_register.SUBMIT_HWDATA, sformat("%1", submit_hwdata ? true:false )); } // ------------------------------------------------------------------ @@ -212,12 +173,6 @@ */ global list<string> add_update_sources () { - - // make it possible to be run as non-root (system will be inconsistent then) - // TODO: to be removed when rug lets authorized users add installation sources - if ( !iamroot ) - return []; - if (!FileUtils::Exists (services_file)) return []; Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.spec.in?rev=40387&r1=40386&r2=40387&view=diff ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Tue Aug 21 21:47:20 2007 @@ -11,6 +11,8 @@ Requires: zmd rug %endif +PreReq: %fillup_prereq + BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-packager BuildArchitectures: noarch @@ -39,6 +41,10 @@ /usr/sbin/useradd -r -s /bin/bash -c "Novell Customer Center User" -d /var/lib/YaST2/suse-ncc-fakehome -g suse-ncc suse-ncc 2> /dev/null || : +%post +%{fillup_only -ns suse_register yast2-registration} + + %files %defattr(-,root,root) %doc @docdir@ @@ -53,4 +59,6 @@ # agents @scrconfdir@/cfg_suse_register.scr +#fillup +@fillupdir@/sysconfig.suse_register-yast2-registration -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org