From: Chris Gianelloni Date: Thu, 8 Jun 2006 21:27:30 +0000 (+0000) Subject: Add patch from bug #135051 to fix the seedcache extraction logic. X-Git-Tag: CATALYST_2_0_6_916~349 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=782b0a5212453f19f7c90a2ee8652e3b23c9145e;p=catalyst.git Add patch from bug #135051 to fix the seedcache extraction logic. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1145 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 3cd5bcbd..a1cc7c2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.629 2006/06/03 01:58:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.630 2006/06/08 21:27:29 wolf31o2 Exp $ + + 08 Jun 2006; Chris Gianelloni + modules/generic_stage_target.py, targets/support/livecdfs-update.sh: + Add patch from bug #135051 to fix the seedcache extraction logic. 03 Jun 2006; Chris Gianelloni targets/support/livecdfs-update.sh: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index ee9141a7..a1c9ce75 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.134 2006/05/19 16:25:20 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.135 2006/06/08 21:27:30 wolf31o2 Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -572,12 +572,22 @@ class generic_stage_target(generic_target): clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack") - if self.settings.has_key("SEEDCACHE") and os.path.isdir(self.settings["source_path"]): - unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"] - display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\ - self.settings["chroot_path"]+" (This may take some time) ...\n" - error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." + if self.settings.has_key("SEEDCACHE"): + if os.path.isdir(self.settings["source_path"]): + # SEEDCACHE Is a directory, use Rsync + unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"] + display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\ + self.settings["chroot_path"]+" (This may take some time) ...\n" + error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." + else: + # SEEDCACHE is a not a directory, try untar'ing + print "Referenced SEEDCACHE does not appear to be a directory, trying to untar..." + display_msg="\nStarting tar extract from "+self.settings["source_path"]+"\nto "+\ + self.settings["chroot_path"]+" (This may take some time) ...\n" + unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"] + error_msg="Tarball extraction of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." else: + # No SEEDCACHE, use tar display_msg="\nStarting tar extract from "+self.settings["source_path"]+"\nto "+\ self.settings["chroot_path"]+" (This may take some time) ...\n" unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"] diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 94aa9178..b48b88a0 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.51 2006/06/03 01:58:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.52 2006/06/08 21:27:30 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -247,6 +247,7 @@ case ${clst_livecd_type} in # Setup Gnome theme if [ "${clst_livecd_xsession}" == "gnome" ] then + # Umm... there is no Clearlooks icon theme. Yup. I'm a retard. # gconftool-2 --direct \ # --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ # --type string --set /desktop/gnome/interface/icon_theme Clearlooks