summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1997-06-20 19:49:11 +0000
committerThomas Bushnell <thomas@gnu.org>1997-06-20 19:49:11 +0000
commit09791c7ac023fe6688c072c1aae6c50daee1f061 (patch)
treeb669d21672a4da537a0c211c8062c113095a1067
parenta8297c7e7cf37673ce734836a2f95d2b5f46d2c7 (diff)
Fri Jun 20 15:37:15 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* bootstrap.c (main/script_paging_file): Instead of returning an error use new variable `had_a_partition' to record whether we successfully opened a partition. (main/script_default_pager): Only start pager if HAD_A_PARTITION; otherwise print warning message. Mon Jun 16 11:52:40 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * Makefile (installationdir): Use `=' to set this instead of :=; $(prefix) is not yet available and `=' postpones the evaluation properly. Reported by Marcus G. Daniels, marcus@cathcart.sysc.pdx.edu.
-rw-r--r--serverboot/ChangeLog15
-rw-r--r--serverboot/Makefile2
-rw-r--r--serverboot/bootstrap.c18
3 files changed, 27 insertions, 8 deletions
diff --git a/serverboot/ChangeLog b/serverboot/ChangeLog
index 79b9c123..01b8065b 100644
--- a/serverboot/ChangeLog
+++ b/serverboot/ChangeLog
@@ -1,3 +1,18 @@
+Fri Jun 20 15:37:15 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+
+ * bootstrap.c (main/script_paging_file): Instead of returning an
+ error use new variable `had_a_partition' to record whether we
+ successfully opened a partition.
+ (main/script_default_pager): Only start pager if HAD_A_PARTITION;
+ otherwise print warning message.
+
+Mon Jun 16 11:52:40 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+
+ * Makefile (installationdir): Use `=' to set this instead of :=;
+ $(prefix) is not yet available and `=' postpones the evaluation
+ properly. Reported by Marcus G. Daniels,
+ marcus@cathcart.sysc.pdx.edu.
+
Tue Jun 10 21:54:52 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* disk_inode.h (struct icommon): Use short instead of uid_t/gid_t
diff --git a/serverboot/Makefile b/serverboot/Makefile
index bb5553fa..ebb0b8be 100644
--- a/serverboot/Makefile
+++ b/serverboot/Makefile
@@ -30,7 +30,7 @@ LCLHDRS = assert.h disk_inode_ffs.h fs.h queue.h defs.h ext2_fs.h \
disk_inode.h file_io.h minix_super.h translate_root.h mach-exec.h
target = serverboot
HURDLIBS = threads
-installationdir := $(prefix)/boot
+installationdir = $(prefix)/boot
vpath boot_script.c $(srcdir)/../boot
diff --git a/serverboot/bootstrap.c b/serverboot/bootstrap.c
index d238e8bb..5a104bf7 100644
--- a/serverboot/bootstrap.c
+++ b/serverboot/bootstrap.c
@@ -139,19 +139,23 @@ main(argc, argv)
char **argv;
{
int doing_default_pager = 0;
+ int had_a_partition = 0;
int script_paging_file (const struct cmd *cmd, int *val)
{
if (add_paging_file (bootstrap_master_device_port, cmd->path))
- {
- printf ("(bootstrap): %s: Cannot add paging file\n", cmd->path);
- return BOOT_SCRIPT_MACH_ERROR;
- }
- return 0;
+ printf ("(bootstrap): %s: Cannot add paging file\n", cmd->path);
+ else
+ had_a_partition = 1;
}
int script_default_pager (const struct cmd *cmd, int *val)
{
- default_pager_initialize(bootstrap_master_host_port);
- doing_default_pager = 1;
+ if (had_a_partition)
+ {
+ default_pager_initialize(bootstrap_master_host_port);
+ doing_default_pager = 1;
+ }
+ else
+ printf ("(bootstrap): Running without any paging\n");
return 0;
}