summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-12-15 19:01:46 +0000
committerJeremy Katz <katzj@redhat.com>2005-12-15 19:01:46 +0000
commit5c77902093238b199929ab17f3626aea91718b52 (patch)
tree81f447d07a53a60f68c951215da49df5c988ec86
parentd15d5ce47372d4bb6918e9b16f5c22e32732b487 (diff)
downloadanaconda-5c77902093238b199929ab17f3626aea91718b52.tar.gz
anaconda-5c77902093238b199929ab17f3626aea91718b52.tar.xz
anaconda-5c77902093238b199929ab17f3626aea91718b52.zip
2005-12-15 Jeremy Katz <katzj@redhat.com>
* loader2/loader.h (FL_UB): Don't reuse a define (oops) and use & instead of &&.
-rw-r--r--ChangeLog3
-rw-r--r--loader2/loader.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c7daae7a..ca0939525 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-12-15 Jeremy Katz <katzj@redhat.com>
+ * loader2/loader.h (FL_UB): Don't reuse a define (oops) and use &
+ instead of &&.
+
* scripts/pkgorder: Fix for new group code.
2005-12-15 Chris Lumens <clumens@redhat.com>
diff --git a/loader2/loader.h b/loader2/loader.h
index 3e846ff6f..eaeaa884e 100644
--- a/loader2/loader.h
+++ b/loader2/loader.h
@@ -36,7 +36,7 @@
#define LOADER_FLAGS_HALT (1 << 13)
#define LOADER_FLAGS_SELINUX (1 << 14)
#define LOADER_FLAGS_VIRTPCONSOLE (1 << 15)
-#define LOADER_FLAGS_UB (1 << 16)
+#define LOADER_FLAGS_UB (1 << 21)
#define LOADER_FLAGS_NOSTORAGE (1 << 30)
#define FL_TESTING(a) ((a) & LOADER_FLAGS_TESTING)
@@ -72,7 +72,7 @@
#define FL_VIRTPCONSOLE(a) ((a) & LOADER_FLAGS_VIRTPCONSOLE)
#define FL_NOSTORAGE(a) ((a) & LOADER_FLAGS_NOSTORAGE)
#define FL_NOPROBE(a) (FL_NOSTORAGE(a) | FL_NONET(a))
-#define FL_UB(a) ((a) && LOADER_FLAGS_UB)
+#define FL_UB(a) ((a) & LOADER_FLAGS_UB)
void startNewt(int flags);
void stopNewt();