summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormaz-12015-10-28 21:19:29 +0800
committermaz-12015-10-28 21:19:29 +0800
commitdf919f4bf1064cb047223b1e8eb74ec7ff543ea6 (patch)
tree11f8b5c92172b5b8f9477725e3f1e7a978d2c4f7
parent7ecaadd15b9b91d0149d05c4efe4063ae7ef0013 (diff)
downloadaur-df919f4bf1064cb047223b1e8eb74ec7ff543ea6.tar.gz
fix
-rw-r--r--PKGBUILD2
-rw-r--r--modify_for_arch.patch62
2 files changed, 59 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index dbd42a519b2..119077174ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,7 +26,7 @@ md5sums=('b7bf49a5516cb9e00943e06e3e73adf2'
'15efc60875b77125f8d5399797306955'
'422ffbdfb1fc79dddf46f868e890e435'
'1f913fe9ca34481134bc36e1045e9a20'
- 'af4f56df7ad0fea080204b35ff206660')
+ 'c62b6aa26a4e01d2509fc80bd505e0f7')
prepare() {
diff --git a/modify_for_arch.patch b/modify_for_arch.patch
index bd94e630684..d7d0a48f289 100644
--- a/modify_for_arch.patch
+++ b/modify_for_arch.patch
@@ -19,7 +19,7 @@ diff -Naur a/program/functions.py b/program/functions.py
print _('Making system dirs ...')
errors = []
- for each in ( '/proc', '/sys', '/tmp', '/mnt', '/media', '/media/cdrom0' ):
-+ for each in ( '/run', '/proc', '/sys', '/tmp', '/mnt', '/media', '/media/cdrom0' ):
++ for each in ( '/run', '/dev', '/proc', '/sys', '/tmp', '/mnt', '/media', '/media/cdrom0' ):
tmp = commands.getstatusoutput( 'mkdir -p %s'%(target_root + each) )
if tmp[0] != 0:
errors.append( _('Error occurred when mkdir %s , you need to make it manually.')%(target_root + each) )
@@ -32,16 +32,16 @@ diff -Naur a/program/functions.py b/program/functions.py
'''
MPs = mp_config.keys()
MPs.sort()
-@@ -438,6 +438,7 @@
+@@ -438,12 +438,14 @@
defaultExcludes.append( '/proc' )
defaultExcludes.append( '/sys' )
defaultExcludes.append( '/tmp' )
+ defaultExcludes.append( '/run' )
++ defaultExcludes.append( '/dev' )
++ defaultExcludes.append( '/.snapshots' )
defaultExcludes.append( '/mnt' )
defaultExcludes.append( '/media' )
-@@ -444,7 +444,6 @@
-
defaultExcludes.append( '/boot/grub' )
defaultExcludes.append( '/etc/fstab' )
- defaultExcludes.append( '/etc/mtab' )
@@ -95,3 +95,57 @@ diff -Naur a/program/ucloner_cmd.py b/program/ucloner_cmd.py
# 修复休眠功能
ret = functions.fix_resume( target_dir, swappart )
+@@ -249,7 +249,7 @@
+ f.close()
+ exList += text
+
+- exclusionListFile = './excludes'
++ exclusionListFile = '/tmp/ucloner_excludes'
+ f = file(exclusionListFile, 'w')
+ for each in exList:
+ f.write( each.strip('\r \n') + '\n' )
+diff -Naur a/ucloner_gui.py b/ucloner_gui.py
+--- a/program/ucloner_gui.py 2015-10-26 23:12:28.000000000 +0800
++++ b/program/ucloner_gui.py 2015-10-28 19:37:18.092016519 +0800
+@@ -53,7 +53,9 @@
+
+
+
+-
++def kill_mksquashfs():
++ os.kill(int(commands.getoutput("ps -ef|grep -P '\d\s+mksquashfs.*/tmp/ucloner_excludes'|head").split()[1]), signal.SIGKILL)
++
+
+
+
+@@ -336,6 +338,7 @@
+ self.parent.set_sensitive(True)
+ try:
+ os.kill( self.id_subproc, signal.SIGKILL )
++ kill_mksquashfs()
+ except:
+ pass
+
+@@ -343,6 +346,7 @@
+ def stop_task(self, widget):
+ try:
+ os.kill( self.id_subproc, signal.SIGKILL )
++ kill_mksquashfs()
+ except:
+ pass
+
+@@ -674,12 +678,14 @@
+ self.parent.set_sensitive(True)
+ try:
+ os.kill( self.id_subproc, signal.SIGKILL )
++ kill_mksquashfs()
+ except:
+ pass
+
+ def stop_task(self, widget):
+ try:
+ os.kill( self.id_subproc, signal.SIGKILL )
++ kill_mksquashfs()
+ except:
+ pass
+