wok-next view gparted/stuff/patches/busybox-compatible.patch @ rev 21087

Updates...
Revert names: libsdl -> sdl, libsmpeg -> smpeg, libtdb -> tdb
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Dec 28 05:11:49 2018 +0200 (2018-12-28)
parents 400dfee62496
children
line source
1 --- a/src/Win_GParted.cc
2 +++ b/src/Win_GParted.cc
3 @@ -2775,12 +2775,12 @@
4 switch ( action )
5 {
6 case SWAPOFF:
7 - cmd = "swapoff -v " + Glib::shell_quote( filesystem_ptn.get_path() );
8 + cmd = "swapoff " + Glib::shell_quote( filesystem_ptn.get_path() );
9 success = ! Utils::execute_command( cmd, output, error );
10 error_msg = "<i># " + cmd + "\n" + error + "</i>";
11 break;
12 case SWAPON:
13 - cmd = "swapon -v " + Glib::shell_quote( filesystem_ptn.get_path() );
14 + cmd = "swapon " + Glib::shell_quote( filesystem_ptn.get_path() );
15 success = ! Utils::execute_command( cmd, output, error );
16 error_msg = "<i># " + cmd + "\n" + error + "</i>";
17 break;
18 --- a/gparted.in
19 +++ b/gparted.in
20 @@ -30,7 +30,7 @@
21 #
22 # Only permit one instance of GParted to execute at a time
23 #
24 -if test "z`ps -e | grep gpartedbin`" != "z"; then
25 +if test "z`pgrep gpartedbin`" != "z"; then
26 echo "The process gpartedbin is already running."
27 echo "Only one gpartedbin process is permitted."
28 exit 1
29 @@ -94,7 +94,7 @@
30 HAVE_SYSTEMCTL=no
31 for k in '' `echo "$PATH" | sed 's,:, ,g'`; do
32 if test -x "$k/systemctl"; then
33 - if test "z`ps -e | grep systemd`" != "z"; then
34 + if test "z`pgrep systemd`" != "z"; then
35 HAVE_SYSTEMCTL=yes
36 break
37 fi
38 @@ -107,7 +107,7 @@
39 #
40 HAVE_UDISKS2_INHIBIT=no
41 if test -x "/usr/lib/udisks2/udisks2-inhibit"; then
42 - if test "z`ps -e | grep 'udisksd'`" != "z"; then
43 + if test "z`pgrep 'udisksd'`" != "z"; then
44 HAVE_UDISKS2_INHIBIT=yes
45 fi
46 fi
47 @@ -119,7 +119,7 @@
48 HAVE_UDISKS=no
49 for k in '' `echo "$PATH" | sed 's,:, ,g'`; do
50 if test -x "$k/udisks"; then
51 - if test "z`ps -e | grep udisks-daemon`" != "z"; then
52 + if test "z`pgrep udisks-daemon`" != "z"; then
53 HAVE_UDISKS=yes
54 break
55 fi
56 @@ -133,7 +133,7 @@
57 HAVE_HAL_LOCK=no
58 for k in '' `echo "$PATH" | sed 's,:, ,g'`; do
59 if test -x "$k/hal-lock"; then
60 - if test "z`ps -e | grep hald`" != "z"; then
61 + if test "z`pgrep hald`" != "z"; then
62 HAVE_HAL_LOCK=yes
63 break
64 fi