Replace mount by nmount, use GNU Make, Fixup print problem

Author: thdaemon

Make.defines.freebsd

@@ -1,4 +1,4 @@
-UELD_OS := freebsd 
+UELD_OS := freebsd
 UELD_OS_CFLAGS := -DBSD
 
 CC := cc

Makefile

@@ -1,9 +1,9 @@
 UELD_OS := unkown
 include version
 
-#ifeq "$(PLATFORM)" ""
-# PLATFORM !=./systype.sh
-#endif
+ifeq "$(PLATFORM)" ""
+ PLATFORM = $(shell ./systype.sh)
+endif
 include Make.defines.$(PLATFORM)
 
 
@@ -13,9 +13,9 @@ ETCDIR := $(PREFIX)/etc/ueld
 
 OBJS := main.o minit.o fileio.o reboot.o tools.o respawn.o os/$(UELD_OS)/pw.o os/$(UELD_OS)/chvt.o os/$(UELD_OS)/ctrlaltdel.o os/$(UELD_OS)/proc.o os/$(UELD_OS)/mnt.o
 CROSS :=
-#ifeq "$(CC)" ""
-# CC := gcc
-#endif
+ifeq "$(CC)" ""
+ CC := gcc
+endif
 STRIP := strip
 
 CFLAG := -Wall -O2 -std=c99 $(UELD_OS_CFLAGS)
@@ -29,8 +29,7 @@ ueld : $(OBJS)
 	@echo "  STRIP	$@"
 	@$(CROSS)$(STRIP) -s $@
 
-.c.o:
-#%.o : %.c config.h
+%.o : %.c config.h
 	@echo "  CC	$@"
 	@$(CROSS)$(CC) -c -o $@ $(CFLAG) $<
 
@@ -54,18 +53,18 @@ install_generic_etc_file:
 	chmod 755 $(ETCDIR)/*.sh
 
 install_no_initramfs:
-	make install_ueld_executable
+	$(MAKE) install_ueld_executable
 
 	mkdir -p $(ETCDIR)
 	cp -n etcfiles/no_initramfs/* $(ETCDIR)/
 	touch $(ETCDIR)/*
 	chmod 755 $(ETCDIR)/*.sh
 
-	make install_generic_etc_file
+	$(MAKE) install_generic_etc_file
 
 install:
-	make install_ueld_executable
-	make install_generic_etc_file
+	$(MAKE) install_ueld_executable
+	$(MAKE) install_generic_etc_file
 
 test:
 	@echo "FIXME: Need a test target"

os/freebsd/mnt.c

@@ -9,10 +9,16 @@
 
 #include <sys/param.h>
 #include <sys/mount.h>
+#include <sys/uio.h>
+
+#define OPT_FSTYPE "fstype"
+#define OPT_FSPATH "fspath"
+#define OPT_FROM "from"
 
 static int _ueld_umount(struct statfs* fs)
 {
-	char *dir, *type;
+	char *dir;
+	struct iovec iov[6];
 
 	dir = fs->f_mntonname;
 
@@ -21,16 +27,39 @@ static int _ueld_umount(struct statfs* fs)
 	if (unmount(dir, 0) == 0)
 		return 0;
 
-	type = fs->f_fstypename;
+	iov[0].iov_base = OPT_FSTYPE;
+	iov[0].iov_len = sizeof(OPT_FSTYPE);
+	iov[1].iov_base = fs->f_fstypename;
+	iov[1].iov_len = strlen(fs->f_fstypename);
 
-	if (mount(type, dir, MNT_RDONLY | MNT_UPDATE, NULL) < 0) {
+	iov[2].iov_base = OPT_FSPATH;
+	iov[2].iov_len = sizeof(OPT_FSPATH);
+	iov[3].iov_base = dir;
+	iov[3].iov_len = strlen(dir);
+
+	iov[4].iov_base = OPT_FROM;
+	iov[4].iov_len = sizeof(OPT_FROM);
+	iov[5].iov_base = fs->f_mntfromname;
+	iov[5].iov_len = strlen(fs->f_mntfromname);
+
+	if (nmount(iov, 6, MNT_RDONLY | MNT_UPDATE) < 0) {
 		ueld_print("Re-mount %s failed (%s), system will"
 		           " not poweroff or poweroff unsafely if"
 		           " the problem can not be fixup later.\n",
 		           dir, strerror(errno));
 		return -1;
 	}
 
+	/*
+	if (mount(type, dir, MNT_RDONLY | MNT_UPDATE, NULL) < 0) {
+		ueld_print("Re-mount %s failed (%s), system will"
+		           " not poweroff or poweroff unsafely if"
+		           " the problem can not be fixup later.\n",
+		           dir, strerror(errno));
+		return -1;
+	}
+	*/
+	
 	return 0;
 }
 

tools.c

@@ -70,19 +70,19 @@ void ueld_print(char* fmt, ...)
 	 * See main.c, for Linux Sysrq SAK problem
 	 * And it cause a window that is not 'SAK safe'
 	 */
-#ifdef LINUX
+//#ifdef LINUX
 	if ((fd = open("/dev/console", O_NOCTTY | O_WRONLY)) < 0)
 		return;
-#else
-	fd = STDOUT_FILENO;
-#endif // LINUX
+//#else
+//	fd = STDOUT_FILENO;
+//#endif // LINUX
 
 	write(fd, "[ueld] ", 7);
 	write(fd, buff, strlen(buff));
 
-#ifdef LINUX
+//#ifdef LINUX
 	close(fd);
-#endif // LINUX
+//#endif // LINUX
 
 	va_end(ap);
 }