aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Gaffney <agaffney@gentoo.org>2007-04-12 14:33:53 +0000
committerAndrew Gaffney <agaffney@gentoo.org>2007-04-12 14:33:53 +0000
commit4408102efc47e6c7a7a6009215de2a015278797d (patch)
tree9370d6f3a35c24e1c7a3d9a0120e10d0d67cbea6 /src
parentdon't freak out if partition table can't be read (diff)
downloadgli-4408102efc47e6c7a7a6009215de2a015278797d.tar.gz
gli-4408102efc47e6c7a7a6009215de2a015278797d.tar.bz2
gli-4408102efc47e6c7a7a6009215de2a015278797d.zip
new gtkfe splash image
create dummy environment.bz2 in livecd-kernel vdb entry for pkgcore/paludis whack flags stuff from Partitioning.py git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1848 f8877401-5920-0410-a79b-8e2d7e04ca0d
Diffstat (limited to 'src')
-rw-r--r--src/GLIArchitectureTemplate.py7
-rw-r--r--src/Partitioning.py12
-rw-r--r--src/fe/gtk/installer-splash.pngbin27771 -> 19340 bytes
3 files changed, 9 insertions, 10 deletions
diff --git a/src/GLIArchitectureTemplate.py b/src/GLIArchitectureTemplate.py
index 2093625..2fda7d6 100644
--- a/src/GLIArchitectureTemplate.py
+++ b/src/GLIArchitectureTemplate.py
@@ -714,15 +714,12 @@ class ArchitectureTemplate:
fileout.write("inherit eutils\n\nDESCRIPTION=\"LiveCD kernel as installed by GLI\"\nHOMEPAGE=\"http://www.gentoo.org/proj/en/releng/installer/\"\nSRC_URI=\nLICENSE=\nSLOT=0\nKEYWORDS=\"%s\"\nIUSE=\nDEPEND=\nPROVIDE=virtual/alsa\n" % arch)
fileout.close()
counter = self._portage.update_counter()
- counter_f = open(self._chroot_dir + "/var/db/pkg/sys-kernel/livecd-kernel-1/COUNTER", "w")
+ counter_f = open(vdbdir + "/COUNTER", "w")
counter_f.write(str(counter))
counter_f.close()
+ GLIUtility.spawn("echo | bzip2 > %s/environment.bz2" % vdbdir)
self.notify_frontend("progress", (1, "Done copying livecd-kernel to chroot"))
-# exitstatus = self._portage.emerge("coldplug", self._install_profile.get_grp_install())
-# self._logger.log("Coldplug emerged. Now they should be added to the boot runlevel.")
-# self._add_to_runlevel("coldplug", runlevel="boot")
-
if self._install_profile.get_kernel_bootsplash():
self._logger.log("Bootsplash enabled for livecd-kernel...this is currently broken, so we're skipping the package install")
# self._logger.log("Bootsplash enabled...emerging necessary packages")
diff --git a/src/Partitioning.py b/src/Partitioning.py
index 0aa1dea..e14b6b8 100644
--- a/src/Partitioning.py
+++ b/src/Partitioning.py
@@ -407,9 +407,9 @@ class Partition:
if device._parted_disk.type.check_feature(parted.DISK_TYPE_PARTITION_NAME):
self._part_name = parted_part.get_name()
# The 10 is completely arbitrary. If flags seem to be missed, this number should be increased
- for flag in range(0, 10):
- if parted_part.is_flag_available(flag) and parted_part.get_flag(flag):
- self._flags.append(flag)
+# for flag in range(0, 10):
+# if parted_part.is_flag_available(flag) and parted_part.get_flag(flag):
+# self._flags.append(flag)
if type == "ext2" or type == "ext3":
block_size = long(string.strip(commands.getoutput("dumpe2fs -h " + self._devnode + r" 2>&1 | grep -e '^Block size:' | sed -e 's/^Block size:\s\+//'")))
@@ -440,7 +440,7 @@ class Partition:
'type': self.get_type,
'minor': self.get_minor,
'mb': self.get_mb,
- 'flags': self.get_flags,
+# 'flags': self.get_flags,
'name': self.get_name,
'devnode': self.get_devnode,
'resizeable': self.get_resizeable,
@@ -457,7 +457,7 @@ class Partition:
def __setitem__(self, name, value):
tmpdict = {
- 'flags': self.set_flags,
+# 'flags': self.set_flags,
'name': self.set_name
}
if name in tmpdict:
@@ -586,6 +586,7 @@ class Partition:
else:
return self._mb
+"""
##
# Resizes the partition
# @param mb New size in MB
@@ -623,6 +624,7 @@ class Partition:
self._mb = mb
self._resized = True
self._device.tidy_partitions()
+"""
##
# Returns a list of detected partitionable devices
diff --git a/src/fe/gtk/installer-splash.png b/src/fe/gtk/installer-splash.png
index b47b5dc..5f6e17c 100644
--- a/src/fe/gtk/installer-splash.png
+++ b/src/fe/gtk/installer-splash.png
Binary files differ