A minor nit +chown root $PROTO/root +chgrp root $PROTO/root
can be done as: chown root:root $PROTO/root -Sanjay Karen Tung wrote: > The following code change addresses 3 different issues: > > 1) Remove 8 packages from the microroot_pkg.txt list as a result of the > flag-day from David Comay today. > 2) Change the hard coded value for "usbgen" from 1800m to 700m. The > optimal solution is > to compute the appropriate size, so, this is just a work around for now. > 3) There's a bug in the existing Distro Constructor code that copies > every single file from the bootcd_skel > directory into the proto area. This is not correct. Only a few > files from bootcd_skel directory needs to > be modified in the proto area. All other changes should be in the > microroot only. This will eventually > get fixed when the bootcd_skel directory goes away. So, this is a > just a temporary fix so that images created > by Distro Constructor can be installed by the Transfer Module. > There's also a change to remove the > install-finish script from bootcd_skel.files since that file is now > delivered by the SUNWslim-utils package. > > The webrev is here: > > http://cr.opensolaris.org/~ktung/dc_transmod_fix/ > > Since we can not do webrev on the tar file, diff on changes to files in > the tar file are here: > > ------------ > > ktung at ox {74002} diff -u /home/ktung/post_process.OLD post_process > --- /home/ktung/post_process.OLD Tue Oct 23 12:15:39 2007 > +++ post_process Tue Oct 23 12:17:11 2007 > @@ -171,23 +171,28 @@ > mkdirs $MICROROOT ./livecd_dirs_list > copyfiles "" $MICROROOT ./livecd_links_list > > -debug_print "Backing up skeleton files before modification to PROTO area" > +debug_print "Backing up original menu.lst before modification to PROTO > area" > > -# First save the originals for use in installation > -while read t m p f; do > - [ -f $PROTO/$f ] && echo $f > -done <$BOOTCD_SKEL_FILES | (cd $PROTO; cpio -o -O skeleton.proto.cpio) > +echo "boot/grub/menu.lst" | (cd $PROTO; cpio -o -O skeleton.cpio) > > -debug_print "Copy skeleton into PROTO area: $PROTO" > -copyfiles "$BOOTCD_SKEL" "$PROTO" $BOOTCD_SKEL_FILES > +debug_print "Modifying Grub menu and icon in PROTO area" > +cp $BOOTCD_SKEL/boot/grub/menu.lst $PROTO/boot/grub/ > +cp $BOOTCD_SKEL/boot/grub/sx-boot.xpm.gz $PROTO/boot/grub/ > > -debug_print "Backing up skeleton files before modification to MICROROOT > area" > +debug_print "Adding root user's directory in PROTO area" > +mkdir -p $PROTO/root/Desktop > +chown root $PROTO/root > +chgrp root $PROTO/root > +chown root $PROTO/root/Desktop > +chgrp root $PROTO/root/Desktop > +mkdir -p $PROTO/root/installer > +chown root $PROTO/root/installer > +chgrp root $PROTO/root/installer > +cp $BOOTCD_SKEL/root/Desktop/install_solaris.desktop $PROTO/root/Desktop/ > +chmod 644 $PROTO/root/Desktop/install_solaris.desktop > +cp $BOOTCD_SKEL/root/installer/install_live $PROTO/root/installer > +chmod 755 $PROTO/root/installer/install_live > > -# First save the originals for use in installation > -while read t m p f; do > - [ -f $MICROROOT/$f ] && echo $f > -done <$BOOTCD_SKEL_FILES | (cd $PROTO; cpio -o -O skeleton.microroot.cpio) > - > debug_print "Copy skeleton into MICROROOT: $MICROROOT" > copyfiles "$BOOTCD_SKEL" "$MICROROOT" $BOOTCD_SKEL_FILES > > ---------------------- > > ktung at ox {74035} diff -u /home/ktung/bootcd_skel.files.old > bootcd_skel/bootcd> > --- /home/ktung/bootcd_skel.files.old Tue Oct 23 14:13:21 2007 > +++ bootcd_skel/bootcd_skel.files Tue Oct 23 12:06:53 2007 > @@ -51,5 +51,4 @@ > f 0644 root:root root/Desktop/install_solaris.desktop > d u=rwx,g=rx,o=rx root:root root/installer > f 0755 root:bin root/installer/install_live > -f 0755 root:bin root/installer/install-finish > > ktung at ox {74036} > > > > _______________________________________________ > caiman-discuss mailing list > caiman-discuss at opensolaris.org > http://mail.opensolaris.org/mailman/listinfo/caiman-discuss >
