webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix unattended installation.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-12-02 00:08:48 +01:00
parent c91d1354c4
commit 40fff54d2b
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lfs/usb-stick
View File

@@ -66,8 +66,8 @@ define COPY_TO_IMG
losetup $$LOOPDEV $$IMAGE && \
mount -t vfat $$LOOPDEV /install/mnt && \
cp -fR /install/cdrom/* /install/mnt && \
mv /install/mnt/boot/isolinux/{instroot,vmlinuz,unattended.conf,splash.lss,*\.msg,memtest} /install/mnt && \
rm -rf /install/mnt/boot && \
mv /install/mnt/boot/isolinux/{instroot,vmlinuz,splash.lss,*\.msg,memtest} /install/mnt && \
rm -rf /install/mnt/boot/isolinux && \
cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/mnt/syslinux.cfg && \
umount /install/mnt && \
losetup -d $$LOOPDEV && \

9
src/install+setup/install/main.c
View File

@@ -557,10 +557,11 @@ EXIT:
fclose(flog);
newtFinished();
// if (!unattended) {
// if (system("/usr/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
// printf("Unable to run setup.\n");
// }
if (unattended) {
// Remove Setup autorun after boot
if (system("rm -f /harddisk/etc/rc.d/rcsysinit.d/S75firstsetup"))
printf("Unable to disable setup autorun.\n");
}
if (system("/bin/umount /harddisk/proc"))
printf("Unable to umount /harddisk/proc.\n");

4
src/install+setup/install/unattended.c
View File

@@ -131,7 +131,7 @@ int unattended_setup(struct keyvalue *unattendedkv) {
/* set root password */
fprintf(flog, "unattended: setting root password\n");
snprintf(commandstring, STRING_SIZE,
"/sbin/chroot /harddisk /bin/sh -c \"echo 'root:%s' | /usr/sbin/chpasswd\"", root_password);
"/usr/sbin/chroot /harddisk /bin/sh -c \"echo 'root:%s' | /usr/sbin/chpasswd\"", root_password);
if (mysystem(commandstring)) {
errorbox("unattended: ERROR setting root password");
return 0;
@@ -140,7 +140,7 @@ int unattended_setup(struct keyvalue *unattendedkv) {
/* set admin password */
fprintf(flog, "unattended: setting admin password\n");
snprintf(commandstring, STRING_SIZE,
"/sbin/chroot /harddisk /usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", admin_password);
"/usr/sbin/chroot /harddisk /usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", admin_password);
if (mysystem(commandstring)) {
errorbox("unattended: ERROR setting admin password");
return 0;