mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-11 03:14:36 +08:00
proper burg-folder patch
This commit is contained in:
parent
bb435da388
commit
a05dfc073d
@ -52,7 +52,7 @@ PACMAN_CONF = '/tmp/larch_pacman.conf'
|
||||
# Medium detection alternatives
|
||||
detection_methods = 'label|uuid|device|search'
|
||||
# Directories to ignore when squashing mods.sqf
|
||||
IGNOREDIRS = 'dev larch media proc sys tmp .*'
|
||||
IGNOREDIRS = 'boot dev larch media proc sys tmp .*'
|
||||
# Valid file-system types for extlinux
|
||||
OKFS = ('ext2', 'ext3', 'ext4', 'btrfs')
|
||||
|
||||
|
@ -111,16 +111,11 @@ class Builder:
|
||||
if os.path.isfile("%s/boot/%s" % (self.installation0, 'vmlinuz26-lts')):
|
||||
writefile('vmlinuz26-lts', self.medium_dir + '/boot/kernelname-lts')
|
||||
|
||||
# if burg folder found we backup it and restore it
|
||||
# if burg folder found we backup it up and restore with tribe later
|
||||
if os.path.isfile("%s/boot/burg" % (self.installation0)):
|
||||
comment("Remove any /boot folder but restore found burg folder")
|
||||
runcmd("cp -Rv %s/boot/burg %s/tmp" % (self.installation0, self.installation0))
|
||||
runcmd("rm -Rfv %s/boot" % (self.installation0))
|
||||
runcmd("mkdir -p %s/boot" % (self.installation0))
|
||||
runcmd("cp -Rv %s/tmp/burg %s/boot" % (self.installation0, self.installation0))
|
||||
else:
|
||||
comment("Remove any /boot folder")
|
||||
runcmd("rm -Rfv %s/boot" % (self.installation0))
|
||||
comment("Backup any found burg folder for tribe to restore")
|
||||
runcmd("mkdir -p %s/opt/chakra/restore" % (self.installation0))
|
||||
runcmd("cp -Rv %s/boot/burg %s/opt/chakra/restore" % (self.installation0, self.installation0))
|
||||
|
||||
# if no saved system.sqf, squash the Arch installation at self.installation_dir
|
||||
if not os.path.isfile(self.system_sqf):
|
||||
|
Loading…
Reference in New Issue
Block a user