Date: Mon, 26 Oct 2009 21:20:08 +0100 From: "Ronald Klop" <ronald-freebsd8@klop.yi.org> To: "Colin Percival" <cperciva@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r198477 - head/usr.sbin/sysinstall Message-ID: <op.u2fb3ue88527sy@82-170-177-25.ip.telfort.nl> In-Reply-To: <200910260651.n9Q6pLfU080067@svn.freebsd.org> References: <200910260651.n9Q6pLfU080067@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
I'm no committer, but isn't it nice to close the fd? Ronald. On Mon, 26 Oct 2009 07:51:21 +0100, Colin Percival <cperciva@freebsd.org>= =20 wrote: > Author: cperciva > Date: Mon Oct 26 06:51:20 2009 > New Revision: 198477 > URL: http://svn.freebsd.org/changeset/base/198477 > > Log: > Eject CDROM after installation if used as source media. > Submitted by: randi > MFC after: 1 month > > Modified: > head/usr.sbin/sysinstall/cdrom.c > > Modified: head/usr.sbin/sysinstall/cdrom.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/sysinstall/cdrom.c Mon Oct 26 00:01:52 2009 (r198476) > +++ head/usr.sbin/sysinstall/cdrom.c Mon Oct 26 06:51:20 2009 (r198477) > @@ -43,6 +43,7 @@ > #include <sys/errno.h> > #include <sys/param.h> > #include <sys/wait.h> > +#include <sys/cdio.h> > #include <unistd.h> > #include <grp.h> > #include <fcntl.h> > @@ -58,6 +59,8 @@ static Boolean previouslyMounted; /* Was > static char mountpoint[MAXPATHLEN] =3D "/dist"; > int CDROMInitQuiet; > +static void mediaEjectCDROM(Device *dev); > + > static properties > read_props(char *name) > { > @@ -218,4 +221,23 @@ mediaShutdownCDROM(Device *dev) > msgConfirm("Could not unmount the CDROM/DVD from %s: %s", mountpoint,= =20 > strerror(errno)); > else > cdromMounted =3D FALSE; > + > + mediaEjectCDROM(dev); > +} > + > +static void > +mediaEjectCDROM(Device *dev) > +{ > + int fd =3D -1; > + > + msgDebug("Ejecting CDROM/DVD at %s", dev->devname); > + > + fd =3D open(dev->devname, O_RDONLY); > +=09 > + if (fd < 0) > + msgDebug("Could not eject the CDROM/DVD from %s: %s", dev->devname, = =20 > strerror(errno)); > + else { > + ioctl(fd, CDIOCALLOW); > + ioctl(fd, CDIOCEJECT); > + } > } > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?op.u2fb3ue88527sy>