diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2007-03-27 16:20:47 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2007-03-27 16:20:47 +0000 |
| commit | 20c2158149fa89a212911ff801aa0c838d977b93 (patch) | |
| tree | 82727359a1c380f6d18ef04da5a2f14594e4fa7e | |
| parent | use html entities instead of < and > in help text (diff) | |
| download | gli-20c2158149fa89a212911ff801aa0c838d977b93.tar.gz gli-20c2158149fa89a212911ff801aa0c838d977b93.tar.bz2 gli-20c2158149fa89a212911ff801aa0c838d977b93.zip | |
move swap activation code before empty mountpoint check
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1837 f8877401-5920-0410-a79b-8e2d7e04ca0d
| -rw-r--r-- | src/GLIArchitectureTemplate.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/GLIArchitectureTemplate.py b/src/GLIArchitectureTemplate.py index 86aea1d..774785f 100644 --- a/src/GLIArchitectureTemplate.py +++ b/src/GLIArchitectureTemplate.py @@ -298,10 +298,6 @@ class ArchitectureTemplate: mountpoint = mount['mountpoint'] mountopts = mount['mountopts'] partition_type = mount['type'] - if not mountpoint: - continue #Skip this. Probably should be an error. but should NEVER happen. - if mountopts: - mountopts = "-o " + mountopts + " " if partition_type in ("linux-swap", "swap"): mount_progress += 1 self.notify_frontend("progress", (float(mount_progress) / (len(mounts)+1), "Activating swap on " + mount['devnode'])) @@ -311,7 +307,11 @@ class ArchitectureTemplate: else: self._swap_devices.append(mount['devnode']) continue - elif partition_type: + if not mountpoint: + continue #Skip this. Probably should be an error. but should NEVER happen. + if mountopts: + mountopts = "-o " + mountopts + " " + if partition_type: if partition_type == "fat32" or partition_type == "fat16": partition_type = "vfat" partition_type = "-t " + partition_type + " " |