060-petitboot-kexec-shutdown-fix.diff

   1 --- a/lib/system/system.h       2013-03-24 12:47:52.743458248 +0100
   2 +++ b/lib/system/system.h       2013-03-24 12:48:01.126792068 +0100
   3 @@ -6,6 +6,7 @@
   4         const char *kexec;
   5         const char *mount;
   6         const char *shutdown;
   7 +       const char *reboot;
   8         const char *sftp;
   9         const char *tftp;
  10         const char *umount;
  11 --- a/lib/system/system.c       2013-03-24 12:36:25.906751623 +0100
  12 +++ b/lib/system/system.c       2013-03-24 12:36:32.726752019 +0100
  13 @@ -21,6 +21,7 @@
  14         .kexec = "/sbin/kexec",
  15         .mount = "/bin/mount",
  16         .shutdown = "/sbin/shutdown",
  17 +       .reboot = "/sbin/reboot",
  18         .sftp = "/usr/bin/sftp",
  19         .tftp = "/usr/bin/tftp",
  20         .umount = "/bin/umount",
  21 --- a/ui/common/ui-system.c     2013-03-24 12:36:46.133419466 +0100
  22 +++ b/ui/common/ui-system.c     2013-03-24 12:37:06.006753956 +0100
  23 @@ -93,10 +93,8 @@
  24         /* First try running shutdown.  Init scripts should run 'exec -e' */
  25
  26         p = argv;
  27 -       *p++ = pb_system_apps.shutdown; /* 1 */
  28 -       *p++ =  "-r";                   /* 2 */
  29 -       *p++ =  "now";                  /* 3 */
  30 -       *p++ =  NULL;                   /* 4 */
  31 +       *p++ = pb_system_apps.reboot;   /* 1 */
  32 +       *p++ =  NULL;
  33
  34         result = pb_run_cmd(argv);
  35