Attachment #76798 for bug #118395




RLOCATE_DB = $(RLOCATE_DB_DIR)/$(rlocate).db
RLOCATE_DB_TMP = $(RLOCATE_DB_DIR)/$(rlocate).db.tmp
MODULE_CFG = $(RLOCATE_DB_DIR)/module.cfg
RLOCATE_GRP =locate
RLOCATED_CMD = $(DESTDIR)$(sbindir)/$(rlocated)
AM_CPPFLAGS = -DRLOCATE_DB=\"$(RLOCATE_DB)\" \
           -DRLOCATE_DB_TMP=\"$(RLOCATE_DB_TMP)\" \


rlocate_SOURCES = pidfile.h pidfile.c main.c link.c misc.c link.h \
	misc.h rlocate.h rlocate.c $(am__append_1)
SUBDIRS = doc rlocate-daemon  rlocate-scripts
EXTRA_DIST = rlocate.cron debian rlocate-scripts autogen.sh \
             contrib install-cron.sh.in ChangeLog.slocate



install-exec-hook:
# if FREEBSD
# 	-/usr/sbin/pw groupadd rlocate	
# else
# 	-/usr/sbin/groupadd rlocate
# endif	
	$(INSTALL) -d $(RLOCATE_DB_DIR)
	chown root:locate $(DESTDIR)$(bindir)/$(rlocate)
	chown root:locate $(RLOCATE_DB_DIR)
	chmod 2755 $(DESTDIR)$(bindir)/$(rlocate)
	chmod 0750 $(RLOCATE_DB_DIR)
	-$(LN_S) -f $(rlocate) $(DESTDIR)$(bindir)/$(updatedb)
	-$(LN_S) -f $(rlocate) $(DESTDIR)$(bindir)/$(locate)
@CRON_TRUE@	$(mkinstalldirs) $(DESTDIR)/etc/cron.daily/
@CRON_TRUE@	sed \
@CRON_TRUE@	-e "s,@UPDATEDB@,$(bindir)/$(updatedb)," \

Lines 168-174 Link Here

(-)rlocate-daemon/Makefile.in.orig (-1 / +1 lines)
168	MODULE_CFG = $(RLOCATE_DB_DIR)/module.cfg	168	MODULE_CFG = $(RLOCATE_DB_DIR)/module.cfg
169	AM_CPPFLAGS = -DRLOCATE_DB=\"$(RLOCATE_DB)\" \	169	AM_CPPFLAGS = -DRLOCATE_DB=\"$(RLOCATE_DB)\" \
170	-DMODULE_CFG=\"$(MODULE_CFG)\" \	170	-DMODULE_CFG=\"$(MODULE_CFG)\" \
171	-DRLOCATE_GRP=\"$(rlocate)\"	171	-DRLOCATE_GRP=\"locate\"
172		172
173	rlocated_SOURCES = ../misc.h ../misc.c ../pidfile.h ../pidfile.c rlocated.c	173	rlocated_SOURCES = ../misc.h ../misc.c ../pidfile.h ../pidfile.c rlocated.c
174	AM_CFLAGS = -O2 -Wall	174	AM_CFLAGS = -O2 -Wall

Lines 343-351 Link Here

(-)rlocate-scripts/Makefile.in.orig (-3 / +1 lines)
343	rm $(srcdir)/rlocate-checkpoint.temp	343	rm $(srcdir)/rlocate-checkpoint.temp
344		344
345	install-exec-hook:	345	install-exec-hook:
346	@FREEBSD_TRUE@ -/usr/sbin/pw groupadd $(rlocate)	346	chown root:locate $(DESTDIR)$(bindir)/rlocate-checkpoint
347	@FREEBSD_FALSE@ -/usr/sbin/groupadd $(rlocate)
348	chown root:$(rlocate) $(DESTDIR)$(bindir)/rlocate-checkpoint
349	chmod 2755 $(DESTDIR)$(bindir)/rlocate-checkpoint	347	chmod 2755 $(DESTDIR)$(bindir)/rlocate-checkpoint
350		348
351	uninstall-hook:	349	uninstall-hook:




#else
static struct class *rlocate_class;
#endif
static struct rw_semaphore namespace_sem;

MODULE_AUTHOR("Rasto Levrinc");
MODULE_DESCRIPTION("rlocate");

                ret = PTR_ERR(rlocate_class);
                goto no_simple_class; 
        }
        class_device_create(rlocate_class, NULL, MKDEV(Major, 0), NULL, 
                                DEVICE_NAME);
        // devfs
        devfs_mk_cdev(MKDEV(Major, 0), S_IFCHR|S_IRUSR|S_IWUSR, DEVICE_NAME);

                }
                return;
        }
        down_read(&namespace_sem); 
        list_for_each(head, &namespace->list) {
	        mnt = list_entry(head, struct vfsmount, mnt_list); 
	        if (mnt->mnt_root == sb_root) {

                        }
                }
        }
        up_read(&namespace_sem); 
        dput(sb_root); 
}


static int __init init_rlocate(void)
{
        int ret;
	init_rwsem(&namespace_sem);
	printk(KERN_INFO "rlocate version "RL_VERSION"\n");
        //init_waitqueue_head (&filenames_wq);
        // register dev 

Return to bug 118395

Lines 196-202 Link Here

(-)Makefile.in.orig (-8 / +6 lines)
196	RLOCATE_DB = $(RLOCATE_DB_DIR)/$(rlocate).db	196	RLOCATE_DB = $(RLOCATE_DB_DIR)/$(rlocate).db
197	RLOCATE_DB_TMP = $(RLOCATE_DB_DIR)/$(rlocate).db.tmp	197	RLOCATE_DB_TMP = $(RLOCATE_DB_DIR)/$(rlocate).db.tmp
198	MODULE_CFG = $(RLOCATE_DB_DIR)/module.cfg	198	MODULE_CFG = $(RLOCATE_DB_DIR)/module.cfg
199	RLOCATE_GRP = $(rlocate)	199	RLOCATE_GRP =locate
200	RLOCATED_CMD = $(DESTDIR)$(sbindir)/$(rlocated)	200	RLOCATED_CMD = $(DESTDIR)$(sbindir)/$(rlocated)
201	AM_CPPFLAGS = -DRLOCATE_DB=\"$(RLOCATE_DB)\" \	201	AM_CPPFLAGS = -DRLOCATE_DB=\"$(RLOCATE_DB)\" \
202	-DRLOCATE_DB_TMP=\"$(RLOCATE_DB_TMP)\" \	202	-DRLOCATE_DB_TMP=\"$(RLOCATE_DB_TMP)\" \
Lines 207-213 Link Here
207		207
208	rlocate_SOURCES = pidfile.h pidfile.c main.c link.c misc.c link.h \	208	rlocate_SOURCES = pidfile.h pidfile.c main.c link.c misc.c link.h \
209	misc.h rlocate.h rlocate.c $(am__append_1)	209	misc.h rlocate.h rlocate.c $(am__append_1)
210	SUBDIRS = doc rlocate-daemon rlocate-module rlocate-scripts	210	SUBDIRS = doc rlocate-daemon rlocate-scripts
211	EXTRA_DIST = rlocate.cron debian rlocate-scripts autogen.sh \	211	EXTRA_DIST = rlocate.cron debian rlocate-scripts autogen.sh \
212	contrib install-cron.sh.in ChangeLog.slocate	212	contrib install-cron.sh.in ChangeLog.slocate
213		213
Lines 704-720 Link Here
704		704
705	install-exec-hook:	705	install-exec-hook:
706	# if FREEBSD	706	# if FREEBSD
707	# -/usr/sbin/pw groupadd rlocate
708	# else	707	# else
709	# -/usr/sbin/groupadd rlocate
710	# endif	708	# endif
711	$(INSTALL) -d $(RLOCATE_DB_DIR)	709	$(INSTALL) -d $(RLOCATE_DB_DIR)
712	chown root:$(rlocate) $(DESTDIR)$(bindir)/$(rlocate)	710	chown root:locate $(DESTDIR)$(bindir)/$(rlocate)
713	chown root:$(rlocate) $(RLOCATE_DB_DIR)	711	chown root:locate $(RLOCATE_DB_DIR)
714	chmod 2755 $(DESTDIR)$(bindir)/$(rlocate)	712	chmod 2755 $(DESTDIR)$(bindir)/$(rlocate)
715	chmod 0750 $(RLOCATE_DB_DIR)	713	chmod 0750 $(RLOCATE_DB_DIR)
716	-$(LN_S) -f $(DESTDIR)$(bindir)/$(rlocate) $(DESTDIR)$(bindir)/$(updatedb)	714	-$(LN_S) -f $(rlocate) $(DESTDIR)$(bindir)/$(updatedb)
717	-$(LN_S) -f $(DESTDIR)$(bindir)/$(rlocate) $(DESTDIR)$(bindir)/$(locate)	715	-$(LN_S) -f $(rlocate) $(DESTDIR)$(bindir)/$(locate)
718	@CRON_TRUE@ $(mkinstalldirs) $(DESTDIR)/etc/cron.daily/	716	@CRON_TRUE@ $(mkinstalldirs) $(DESTDIR)/etc/cron.daily/
719	@CRON_TRUE@ sed \	717	@CRON_TRUE@ sed \
720	@CRON_TRUE@ -e "s,@UPDATEDB@,$(bindir)/$(updatedb)," \	718	@CRON_TRUE@ -e "s,@UPDATEDB@,$(bindir)/$(updatedb)," \

Lines 60-65 Link Here

(-)rlocate-module/rlocate.c.orig (-3 / +5 lines)
60	#else	60	#else
61	static struct class *rlocate_class;	61	static struct class *rlocate_class;
62	#endif	62	#endif
		63	static struct rw_semaphore namespace_sem;
63		64
64	MODULE_AUTHOR("Rasto Levrinc");	65	MODULE_AUTHOR("Rasto Levrinc");
65	MODULE_DESCRIPTION("rlocate");	66	MODULE_DESCRIPTION("rlocate");
Lines 680-686 Link Here
680	ret = PTR_ERR(rlocate_class);	681	ret = PTR_ERR(rlocate_class);
681	goto no_simple_class;	682	goto no_simple_class;
682	}	683	}
683	class_device_create(rlocate_class, MKDEV(Major, 0), NULL,	684	class_device_create(rlocate_class, NULL, MKDEV(Major, 0), NULL,
684	DEVICE_NAME);	685	DEVICE_NAME);
685	// devfs	686	// devfs
686	devfs_mk_cdev(MKDEV(Major, 0), S_IFCHR\|S_IRUSR\|S_IWUSR, DEVICE_NAME);	687	devfs_mk_cdev(MKDEV(Major, 0), S_IFCHR\|S_IRUSR\|S_IWUSR, DEVICE_NAME);
Lines 835-841 Link Here
835	}	836	}
836	return;	837	return;
837	}	838	}
838	down_read(&namespace->sem);	839	down_read(&namespace_sem);
839	list_for_each(head, &namespace->list) {	840	list_for_each(head, &namespace->list) {
840	mnt = list_entry(head, struct vfsmount, mnt_list);	841	mnt = list_entry(head, struct vfsmount, mnt_list);
841	if (mnt->mnt_root == sb_root) {	842	if (mnt->mnt_root == sb_root) {
Lines 848-854 Link Here
848	}	849	}
849	}	850	}
850	}	851	}
851	up_read(&namespace->sem);	852	up_read(&namespace_sem);
852	dput(sb_root);	853	dput(sb_root);
853	}	854	}
854		855
Lines 930-935 Link Here
930	static int __init init_rlocate(void)	931	static int __init init_rlocate(void)
931	{	932	{
932	int ret;	933	int ret;
		934	init_rwsem(&namespace_sem);
933	printk(KERN_INFO "rlocate version "RL_VERSION"\n");	935	printk(KERN_INFO "rlocate version "RL_VERSION"\n");
934	//init_waitqueue_head (&filenames_wq);	936	//init_waitqueue_head (&filenames_wq);
935	// register dev	937	// register dev