Re: [master] Fix compile problem from 65a3c05.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Ack.

On 01/20/2010 01:48 PM, Ales Kozumplik wrote:
---
  loader/init.c     |    1 -
  loader/init.h     |    2 --
  loader/shutdown.c |    4 ++--
  3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/loader/init.c b/loader/init.c
index 715348f..6cb013d 100644
--- a/loader/init.c
+++ b/loader/init.c
@@ -409,7 +409,6 @@ static void termReset(void) {
  /* reboot handler */
  static void sigintHandler(int signum) {
      termReset();
-	shouldReboot = 1;
      shutDown(getKillPolicy(), REBOOT);
  }

diff --git a/loader/init.h b/loader/init.h
index 413c8ba..733bc8e 100644
--- a/loader/init.h
+++ b/loader/init.h
@@ -25,6 +25,4 @@ typedef enum {
  	HALT
  } reboot_action;

-extern int shouldReboot;
-
  #endif /* INIT_H */
diff --git a/loader/shutdown.c b/loader/shutdown.c
index 5fc3bed..774e11a 100644
--- a/loader/shutdown.c
+++ b/loader/shutdown.c
@@ -80,8 +80,8 @@ static void performReboot(reboot_action rebootAction) {

  void shutDown(int doKill, reboot_action rebootAction) {
  	if (doKill) {
-		performUnmounts(doKill);
-		performTerminations(doKill);
+		performUnmounts();
+		performTerminations();
  	}

  	if ((rebootAction == POWEROFF || rebootAction == REBOOT)&&  doKill) {

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux